diff --git a/.travis.yml b/.travis.yml index 5977deb0b9b6e..dae7cc3e11c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,8 +56,8 @@ jobs: # Initial test stage, if this fails everything else is cancelled. - stage: Test # Clang is consistently the fastest to build, so use it for the initial test. - # Clang 3.8, oldest supported Clang, build with Makefile with extra tests and json style check. env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"' + name: "Clang 3.8 Make build with curses, style check and RL_Classes test" compiler: clang addons: &clang38 apt: @@ -66,24 +66,24 @@ jobs: # Then build different configurations and targets in parallel. - stage: "Main Compilers" - # GCC 5.3, oldest supported GCC, build with Makefile configured for Curses, disable LOCALIZE env: COMPILER=g++ LOCALIZE=0 + name: "GCC 5.3 Make build with curses and no Localization" compiler: gcc addons: &gcc53 apt: packages: ["g++-5=5.3.1-14ubuntu2", "libstdc++-5-dev=5.3.1-14ubuntu2", "gcc-5=5.3.1-14ubuntu2", "gcc-5-base=5.3.1-14ubuntu2", "cpp-5=5.3.1-14ubuntu2", "libgcc-5-dev=5.3.1-14ubuntu2", "libasan2=5.3.1-14ubuntu2", "libmpx0=5.3.1-14ubuntu2"] sources: [*apt_sources] - # GCC 8, latest supported GCC, build with Makefile configured with TILES and SOUND and use address sanitization - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address + name: "GCC 8 Make build with Tiles, Sound and address sanitization" compiler: gcc addons: &gcc8 apt: packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"] sources: *apt_sources - # Clang 8, latest supported Clang, build with Makefile and address sanitization, but disable some very long-running tests - env: CLANG=clang++-8 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items" + name: "Clang 8 Make build with address sanitization, but long-running tests disabled" compiler: clang addons: &clang8 apt: @@ -92,23 +92,21 @@ jobs: - stage: "Platforms and Tidy" # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt - # Mingw-w64 building with Tiles and Sound env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' TILES=1 SOUND=1 + name: "Mingw-w64 Make cross-compile to Windows with Tiles and Sound" compiler: gcc addons: &gcc apt: packages: ["wine"] - # macOS Tiles - # Xcode 10.1 building with Tiles and sound - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 TILES=1 SOUND=1 + name: "Xcode 10.1 Make build with Tiles and sound (macOS)" os: osx osx_image: xcode10.1 compiler: clang - # Execute Clang-tidy with CMake, configured with Tiles and Sound - # (analysis only; no build or tests) - env: CLANG=clang++-8 TILES=1 SOUND=1 CXXFLAGS=-Wno-unused-command-line-argument CMAKE=1 CATA_CLANG_TIDY=clang-tidy-8 + name: "Clang-tidy CMake build with Tiles and Sound" compiler: clang addons: &clang8 apt: @@ -117,12 +115,13 @@ jobs: # Finally check the compiler variants - stage: compilers - # GCC 5.4 is default on Xenial + # GCC 5.4 is default on Xenial env: COMPILER=g++ + name: "GCC 5.4 Make build with Curses" if: type != pull_request - # GCC 6 - env: COMPILER=g++-6 + name: "GCC 6 Make build with Curses" if: type != pull_request compiler: gcc addons: &gcc6 @@ -130,8 +129,8 @@ jobs: packages: ["g++-6", "g++-6-multilib", "libc6-dbg", "libc6-dbg:i386"] sources: *apt_sources - # GCC 7, adding _GLIBCXX_DEBUG so that one build can test with that - env: COMPILER=g++-7 CXXFLAGS='-Wno-implicit-fallthrough -D_GLIBCXX_DEBUG' CODE_COVERAGE=true + name: "GCC 7 Make build with Curses, GLIBCXX_DEBUG and code coverage" if: type != pull_request compiler: gcc addons: &gcc7 @@ -139,15 +138,15 @@ jobs: packages: ["g++-7", "g++-7-multilib", "libc6-dbg", "libc6-dbg:i386", "lcov"] sources: *apt_sources - # GCC MinGW with only terminal support - env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' + name: "Mingw-w64 Make build with Curses" if: type != pull_request addons: &gcc apt: packages: ["wine"] - # Clang 3.9 - env: CLANG=clang++-3.9 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"' + name: "Clang 3.9 Make build with Curses" if: type != pull_request compiler: clang addons: &clang39 @@ -155,8 +154,8 @@ jobs: packages: ["clang-3.9", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"] sources: *apt_sources - # Clang 4.0 - env: CLANG=clang++-4.0 CXXFLAGS=-Wno-error=unused-command-line-argument + name: "Clang 4 Make build with Curses" if: type != pull_request compiler: clang addons: &clang40 @@ -168,6 +167,7 @@ jobs: # Clang 5.0 (still on Trusty, because I could find no readily available # source on Xenial at time of writing) - env: CLANG=clang++-5.0 CXXFLAGS=-Wno-error=unused-command-line-argument + name: "Clang 5 Make build with Curses" if: type != pull_request dist: trusty compiler: clang @@ -176,8 +176,8 @@ jobs: packages: ["clang-5.0", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"] sources: [*apt_sources, llvm-toolchain-trusty-5.0] - # CMake Clang 6.0 Tiles with CMAKE - env: CLANG=clang++-6.0 TILES=1 SOUND=1 CXXFLAGS=-Wno-error=unused-command-line-argument CMAKE=1 RELEASE=1 + name: "Clang 6 CMake build with tiles and sound" if: type != pull_request compiler: clang addons: &clang60 @@ -185,8 +185,8 @@ jobs: packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"] sources: [*apt_sources, llvm-toolchain-xenial-6.0] - # Clang 7 - env: CLANG=clang++-7 + name: "Clang 7 Make build with Curses" if: type != pull_request compiler: clang addons: &clang7 diff --git a/data/json/construction.json b/data/json/construction.json index b3b62e8621505..9d5977cfebb95 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -4,7 +4,7 @@ "description": "Deconstruct Furniture", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ], "pre_special": "check_deconstruct", "post_special": "done_deconstruct" @@ -14,7 +14,7 @@ "description": "Deconstruct Simple Furniture", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 10, + "time": "10 m", "pre_note": "Certain terrain and furniture can be deconstructed without any tools.", "pre_flags": "EASY_DECONSTRUCT", "pre_special": "check_deconstruct", @@ -25,7 +25,7 @@ "description": "Make crafting spot", "category": "OTHER", "required_skills": [ ], - "time": 0, + "time": "0 m", "pre_note": "Mark a spot for crafting. Crafting tasks next to this tile will automatically use this location instead of attempting to craft in your hands, with the usual crafting speed penalty for working on the ground. Does not prevent using a proper workbench, if available. Deconstruct or smash to remove.", "pre_special": "check_empty", "post_terrain": "f_ground_crafting_spot" @@ -35,7 +35,7 @@ "description": "Spike Pit", "category": "DIG", "required_skills": [ [ "survival", 1 ] ], - "time": 30, + "time": "30 m", "components": [ [ [ "spear_wood", 4 ], [ "pointy_stick", 4 ] ] ], "pre_terrain": "t_pit", "post_terrain": "t_pit_spiked" @@ -45,7 +45,7 @@ "description": "Glass Pit", "category": "DIG", "required_skills": [ [ "survival", 1 ] ], - "time": 30, + "time": "30 m", "components": [ [ [ "glass_shard", 20 ] ] ], "pre_terrain": "t_pit", "post_terrain": "t_pit_glass" @@ -55,7 +55,7 @@ "description": "Chop Tree Trunk Into Planks", "category": "FARM_WOOD", "required_skills": [ [ "survival", 2 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ] ], "pre_terrain": "t_trunk", "post_terrain": "t_dirt", @@ -67,7 +67,7 @@ "description": "Build Improvised Shelter", "category": "CONSTRUCT", "required_skills": [ [ "survival", 2 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ] ], "components": [ [ [ "stick", 12 ], [ "2x4", 6 ] ], [ [ "pine_bough", 24 ], [ "willowbark", 24 ] ] ], "pre_terrain": "t_pit_shallow", @@ -79,7 +79,7 @@ "//": "Door frame not required", "category": "CONSTRUCT", "required_skills": [ [ "tailor", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "nail", 4 ], [ "pointy_stick", 2 ], [ "spike", 2 ] ], @@ -96,7 +96,7 @@ "description": "Build Beaded Curtain", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "wooden_bead", 2000 ] ], [ [ "stick_long", 1 ] ], [ [ "string_36", 20 ] ] ], "pre_note": "Can be deconstructed without tools.", @@ -108,7 +108,7 @@ "description": "Build Makeshift Door", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "CUT", "level": 1 } ] ], "components": [ [ [ "2x4", 6 ], [ "stick", 6 ] ], [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ] ], "pre_note": "Can be deconstructed without tools.", @@ -121,7 +121,7 @@ "//": "Step 1: door frame", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 24 ] ] ], "pre_special": "check_empty", @@ -133,7 +133,7 @@ "//": "Step 2: door", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 12 ] ] ], "pre_terrain": "t_door_frame", @@ -145,7 +145,7 @@ "//": "Step 3: peephole", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 15, + "time": "15 m", "qualities": [ [ { "id": "DRILL", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "peephole", 1 ] ] ], "pre_terrain": "t_door_c", @@ -157,7 +157,7 @@ "//": "Repair the regular door", "category": "REPAIR", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 3 ] ], [ [ "nail", 12 ] ] ], "pre_terrain": "t_door_b", @@ -169,7 +169,7 @@ "//": "Repair the peephole door", "category": "REPAIR", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 3 ] ], [ [ "nail", 12 ] ] ], "pre_terrain": "t_door_b_peep", @@ -181,7 +181,7 @@ "//": "Repair the reinforced door", "category": "REPAIR", "required_skills": [ [ "fabrication", 2 ] ], - "time": 45, + "time": "45 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 24 ] ] ], "pre_terrain": "t_rdoor_b", @@ -193,7 +193,7 @@ "//": "regular door", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_flags": "BARRICADABLE_DOOR", @@ -205,7 +205,7 @@ "//": "peephole door", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_terrain": "t_door_c_peep", @@ -217,7 +217,7 @@ "//": "boarded damaged door", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_flags": "BARRICADABLE_DOOR_DAMAGED", @@ -229,7 +229,7 @@ "//": "boarded damaged peephole door", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_terrain": "t_door_b_peep", @@ -241,7 +241,7 @@ "//": "the reinforced doors", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_flags": "BARRICADABLE_DOOR_REINFORCED", @@ -253,7 +253,7 @@ "//": "damaged reinforced doors", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_flags": "BARRICADABLE_DOOR_REINFORCED_DAMAGED", @@ -264,7 +264,7 @@ "description": "Reinforce Wood Door", "category": "REINFORCE", "required_skills": [ [ "fabrication", 3 ] ], - "time": 90, + "time": "90 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 48 ] ] ], "pre_flags": "BARRICADABLE_DOOR", @@ -276,7 +276,7 @@ "//": "step 1: door frame", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 90, + "time": "90 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ], "components": [ [ [ "spike", 8 ] ], [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ] ], "pre_special": "check_empty", @@ -288,7 +288,7 @@ "//": "Step 2: metal door", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 7 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "steel_lump", 4 ], [ "steel_chunk", 12 ], [ "scrap", 36 ] ], [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ] ], "pre_terrain": "t_mdoor_frame", @@ -300,7 +300,7 @@ "//": "Step 3: peephole", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 25, + "time": "25 m", "qualities": [ [ { "id": "DRILL", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "peephole", 1 ] ] ], "pre_terrain": "t_door_metal_c", @@ -312,7 +312,7 @@ "//": "Step 1: window frame", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 75, + "time": "75 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "nail", 30 ] ] ], "pre_special": "check_empty", @@ -324,7 +324,7 @@ "//": "Step 2: window, no curtains", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 30, + "time": "30 m", "components": [ [ [ "glass_sheet", 1 ] ] ], "pre_terrain": "t_window_empty", "post_terrain": "t_window_no_curtains" @@ -335,7 +335,7 @@ "//": "Step 3: window with curtains", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "SAW_W", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "nail", 4 ] ], [ [ "sheet", 2 ] ], [ [ "stick", 1 ] ], [ [ "string_36", 1 ] ] ], "pre_terrain": "t_window_no_curtains", @@ -346,7 +346,7 @@ "description": "Clean Broken Window", "category": "REPAIR", "required_skills": [ [ "fabrication", 0 ] ], - "time": 5, + "time": "5 m", "pre_terrain": "t_window_frame", "post_terrain": "t_window_empty" }, @@ -356,7 +356,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 5, + "time": "5 m", "components": [ [ [ "duct_tape", 50 ] ] ], "pre_terrain": "t_window", "post_terrain": "t_window_taped" @@ -367,7 +367,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 5, + "time": "5 m", "components": [ [ [ "duct_tape", 50 ] ] ], "pre_terrain": "t_window_domestic", "post_terrain": "t_window_domestic_taped" @@ -378,7 +378,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 5, + "time": "5 m", "components": [ [ [ "duct_tape", 50 ] ] ], "pre_terrain": "t_window_alarm", "post_terrain": "t_window_alarm_taped" @@ -389,7 +389,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 5, + "time": "5 m", "components": [ [ [ "duct_tape", 50 ] ] ], "pre_terrain": "t_window_no_curtains", "post_terrain": "t_window_no_curtains_taped" @@ -400,7 +400,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 2, + "time": "2 m", "qualities": [ [ { "id": "CUT", "level": 1 } ] ], "pre_terrain": "t_window_taped", "post_terrain": "t_window" @@ -411,7 +411,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 2, + "time": "2 m", "qualities": [ [ { "id": "CUT", "level": 1 } ] ], "pre_terrain": "t_window_domestic_taped", "post_terrain": "t_window_domestic" @@ -422,7 +422,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 2, + "time": "2 m", "qualities": [ [ { "id": "CUT", "level": 1 } ] ], "pre_terrain": "t_window_alarm_taped", "post_terrain": "t_window_alarm" @@ -433,7 +433,7 @@ "//": "Need a recipe for each type of window tapable due to how code works", "category": "REINFORCE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 2, + "time": "2 m", "qualities": [ [ { "id": "CUT", "level": 1 } ] ], "pre_terrain": "t_window_no_curtains_taped", "post_terrain": "t_window_no_curtains" @@ -444,7 +444,7 @@ "//": "Board up normal window", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_flags": "BARRICADABLE_WINDOW", @@ -456,7 +456,7 @@ "//": "Board up window with curtains", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_flags": "BARRICADABLE_WINDOW_CURTAINS", @@ -469,7 +469,7 @@ "//": "Board up empty window", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_terrain": "t_window_empty", @@ -481,7 +481,7 @@ "//": "Board up window frame only", "category": "REINFORCE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_terrain": "t_window_frame", @@ -493,7 +493,7 @@ "//": "For regular windows", "category": "REINFORCE", "required_skills": [ [ "fabrication", 3 ] ], - "time": 40, + "time": "40 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], [ [ "nail", 16 ] ] ], "pre_terrain": "t_window_boarded", @@ -505,7 +505,7 @@ "//": "For windows with no glass that were barricaded", "category": "REINFORCE", "required_skills": [ [ "fabrication", 3 ] ], - "time": 40, + "time": "40 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], [ [ "nail", 16 ] ] ], "pre_terrain": "t_window_boarded_noglass", @@ -517,7 +517,7 @@ "//": "Armo up regular reinforced window", "category": "REINFORCE", "required_skills": [ [ "fabrication", 6 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "spike", 4 ] ], [ [ "steel_plate", 1 ], [ "sheet_metal", 4 ] ] ], "pre_terrain": "t_window_reinforced", @@ -529,7 +529,7 @@ "//": "When underlying window has no glass", "category": "REINFORCE", "required_skills": [ [ "fabrication", 6 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "spike", 4 ] ], [ [ "steel_plate", 1 ], [ "sheet_metal", 4 ] ] ], "pre_terrain": "t_window_reinforced_noglass", @@ -540,7 +540,7 @@ "description": "Build Metal Bars", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], - "time": 60, + "time": "60 m", "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ], "qualities": [ [ { "id": "SAW_M", "level": 1 }, { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 6 ] ], [ [ "sheet_metal", 2 ] ] ], @@ -553,7 +553,7 @@ "//": "Step 1: half of a wall in an empty space", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ], - "time": 50, + "time": "50 m", "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "2x4", 5 ], [ "stick", 10 ] ], @@ -571,7 +571,7 @@ "//": "Step 2: complete the half made wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ], - "time": 50, + "time": "50 m", "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "2x4", 5 ], [ "stick", 10 ] ], @@ -588,7 +588,7 @@ "description": "Repair Wattle-and-Daub Wall", "category": "REPAIR", "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "2x4", 2 ], [ "stick", 4 ] ], @@ -606,7 +606,7 @@ "//": "Step 1: half of a wall where a window used to be", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 50, + "time": "50 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 10 ] ], [ [ "nail", 20 ] ] ], "pre_terrain": "t_window_empty", @@ -618,7 +618,7 @@ "//": "Step 1: half of a wall in an empty space", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 50, + "time": "50 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 10 ] ], [ [ "nail", 20 ] ] ], "pre_special": "check_empty", @@ -630,7 +630,7 @@ "//": "Step 2: complete the half made wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 50, + "time": "50 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 10 ] ], [ [ "nail", 20 ] ] ], "pre_terrain": "t_wall_half", @@ -642,7 +642,7 @@ "//": "fix a chip", "category": "REPAIR", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 16 ] ] ], "pre_terrain": "t_wall_wood_chipped", @@ -654,7 +654,7 @@ "//": "fix the broken to chipped", "category": "REPAIR", "required_skills": [ [ "fabrication", 1 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], [ [ "nail", 32 ] ] ], "pre_terrain": "t_wall_wood_broken", @@ -666,7 +666,7 @@ "//": "Step 1: half of a log wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "log", 2 ] ], [ [ "stick", 3 ], [ "2x4", 6 ] ] ], "pre_terrain": "t_pit_shallow", @@ -678,7 +678,7 @@ "//": "Step 2: Finish the log wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "log", 2 ] ], [ [ "stick", 3 ], [ "2x4", 6 ] ] ], "pre_terrain": "t_wall_log_half", @@ -690,7 +690,7 @@ "//": "Fix the chipped back to normal", "category": "REPAIR", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 16 ] ] ], "pre_terrain": "t_wall_log_chipped", @@ -702,7 +702,7 @@ "//": "fix broken back to chipped", "category": "REPAIR", "required_skills": [ [ "fabrication", 2 ] ], - "time": 50, + "time": "50 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 1 ] ], [ [ "2x4", 2 ] ], [ [ "nail", 24 ] ] ], "pre_terrain": "t_wall_log_broken", @@ -714,7 +714,7 @@ "//": "Step 1: Build sandbag barricade", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 16, + "time": "16 m", "components": [ [ [ "sandbag", 16 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", @@ -726,7 +726,7 @@ "//": "Step 2: Finish the sandbag wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 20, + "time": "20 m", "components": [ [ [ "sandbag", 20 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_terrain": "f_sandbag_half", @@ -738,7 +738,7 @@ "//": "Step 1: Build earthbag barricade", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 16, + "time": "16 m", "components": [ [ [ "earthbag", 16 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", @@ -750,7 +750,7 @@ "//": "Step 2: Finish the earthbag wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 20, + "time": "20 m", "components": [ [ [ "earthbag", 20 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_terrain": "f_earthbag_half", @@ -762,7 +762,7 @@ "//": "Step 1: foundation", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 90, + "time": "90 m", "qualities": [ { "id": "GLARE", "level": 2 } ], "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ], "components": [ [ [ "steel_plate", 2 ] ] ], @@ -775,7 +775,7 @@ "//": "Step 2: finish wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 90, + "time": "90 m", "qualities": [ { "id": "GLARE", "level": 2 } ], "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ], "components": [ [ [ "steel_plate", 2 ] ] ], @@ -788,7 +788,7 @@ "//": "Step 1: start wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "brick", 15 ] ], [ [ "mortar_build", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ], "pre_terrain": "t_dirt", @@ -800,7 +800,7 @@ "//": "Step 2: finish wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "brick", 15 ] ], [ [ "mortar_build", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ], "pre_terrain": "t_brick_wall_halfway", @@ -812,7 +812,7 @@ "//": "Builds a concrete floor from a pit.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 60, + "time": "60 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "concrete", 2 ] ], [ [ "water", 2 ] ] ], @@ -825,7 +825,7 @@ "//": "Step 1: foundation", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 180, + "time": "180 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ], @@ -838,7 +838,7 @@ "//": "Step 2: finish wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 180, + "time": "180 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ], @@ -851,7 +851,7 @@ "//": "Step 1: rebar cage", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "rebar", 16 ] ] ], "pre_terrain": "t_pit", @@ -863,7 +863,7 @@ "//": "Step 2: foundation", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 120, + "time": "120 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ], @@ -876,7 +876,7 @@ "//": "Step 3: finish wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 120, + "time": "120 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ], @@ -889,7 +889,7 @@ "//": "Step 1: rebar cage", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "rebar", 16 ] ] ], "pre_terrain": "t_pit", @@ -901,7 +901,7 @@ "//": "Step 2: foundation", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 120, + "time": "120 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ], @@ -914,7 +914,7 @@ "//": "Step 3: finish column", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 120, + "time": "120 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "concrete", 6 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ], @@ -926,7 +926,7 @@ "description": "Build Metal Roof", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], - "time": 90, + "time": "90 m", "qualities": [ { "id": "GLARE", "level": 2 } ], "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ], "components": [ [ [ "steel_plate", 2 ] ] ], @@ -940,7 +940,7 @@ "//": "Step 1: rebar cage & supports", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "rebar", 8 ] ], [ [ "2x4", 12 ] ], [ [ "pipe", 4 ] ] ], "pre_terrain": "t_pit_shallow", @@ -952,7 +952,7 @@ "//": "Step 2: roof & floor", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], - "time": 120, + "time": "120 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "concrete", 4 ] ], [ [ "water", 4 ] ] ], @@ -965,7 +965,7 @@ "//": "Step 1: rebar cage & supports", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 180, + "time": "180 m", "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "rebar", 12 ] ], [ [ "2x4", 12 ] ], [ [ "pipe", 4 ] ] ], "pre_terrain": "t_pit", @@ -977,7 +977,7 @@ "//": "Step 2: start roof & floor", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 180, + "time": "180 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "concrete", 6 ] ], [ [ "water", 3 ] ] ], @@ -990,7 +990,7 @@ "//": "Step 3: finish roof & floor", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], - "time": 180, + "time": "180 m", "tools": [ [ [ "con_mix", 50 ] ] ], "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ], "components": [ [ [ "concrete", 6 ] ], [ [ "water", 3 ] ] ], @@ -1002,7 +1002,7 @@ "description": "Build Palisade Wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ], [ "survival", 2 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "log", 3 ] ], @@ -1024,7 +1024,7 @@ "//": "Step 1: half the wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ], - "time": 180, + "time": "180 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 12 ] ] ], "pre_special": "check_empty", @@ -1036,7 +1036,7 @@ "//": "Step 2: the full wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ], - "time": 180, + "time": "180 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 12 ] ] ], "pre_terrain": "t_rock_wall_half", @@ -1048,7 +1048,7 @@ "//": "a thin half-wall used to divide rooms.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 50, + "time": "50 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 10 ] ], [ [ "nail", 20 ] ] ], "pre_special": "check_empty", @@ -1059,7 +1059,7 @@ "description": "Build Roof", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], [ [ "nail", 40 ] ] ], "pre_note": "Must be supported on at least two sides.", @@ -1071,7 +1071,7 @@ "description": "Build Thatched Roof", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ], [ "survival", 7 ] ], - "time": 360, + "time": "360 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 5 ], [ "stick", 10 ] ], [ [ "straw_pile", 60 ], [ "withered", 60 ] ], [ [ "cordage", 8, "LIST" ] ] ], "pre_special": "check_support", @@ -1082,7 +1082,7 @@ "description": "Build Log & Sod Roof", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 2 ] ], @@ -1099,7 +1099,7 @@ "description": "Build Rope & Pulley System", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ], [ "mechanics", 2 ] ], - "time": 60, + "time": "60 m", "components": [ [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ], [ [ "stick", 8 ], [ "2x4", 8 ] ] ], "pre_note": "Can be deconstructed without tools. Must be adjacent to a palisade wall that is itself adjacent to a palisade gate in order to open said gate.", "pre_special": "check_empty", @@ -1110,7 +1110,7 @@ "description": "Build Palisade Gate", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ], [ "survival", 2 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "log", 2 ] ], [ [ "2x4", 3 ] ], [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ], [ "vine_30", 1 ] ] ], "pre_note": "Must be between palisade walls to function, and at least one wall must have an adjacent rope & pulley system.", @@ -1122,7 +1122,7 @@ "description": "Build Fence Posts", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ], [ "survival", 0 ] ], - "time": 15, + "time": "15 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "pointy_stick", 2 ], [ "spear_wood", 2 ] ] ], "pre_flags": "DIGGABLE", @@ -1133,7 +1133,7 @@ "description": "Build Fence", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 15, + "time": "15 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 5 ] ], [ [ "nail", 8 ] ] ], "pre_terrain": "t_fence_post", @@ -1144,7 +1144,7 @@ "description": "Build Fence Gate", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "pointy_stick", 2 ], [ "spear_wood", 2 ] ], [ [ "2x4", 5 ] ], [ [ "nail", 12 ] ] ], "pre_flags": "DIGGABLE", @@ -1155,7 +1155,7 @@ "description": "Build Rope Fence", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 15, + "time": "15 m", "components": [ [ [ "rope_6", 2 ] ] ], "pre_terrain": "t_fence_post", "post_terrain": "t_fence_rope" @@ -1165,7 +1165,7 @@ "description": "Build Wire Fence", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 15, + "time": "15 m", "components": [ [ [ "wire", 2 ] ] ], "pre_terrain": "t_fence_post", "post_terrain": "t_fence_wire" @@ -1175,7 +1175,7 @@ "description": "Build Barbed Wire Fence", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 15, + "time": "15 m", "components": [ [ [ "wire_barbed", 2 ] ] ], "pre_terrain": "t_fence_post", "post_terrain": "t_fence_barbed" @@ -1186,7 +1186,7 @@ "//": "Step 1: fence posts", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "pipe", 6 ] ], [ [ "scrap", 8 ] ] ], "pre_flags": "DIGGABLE", @@ -1198,7 +1198,7 @@ "//": "Step 2: chainlink", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 120, + "time": "120 m", "components": [ [ [ "wire", 20 ] ] ], "pre_terrain": "t_chainfence_posts", "post_terrain": "t_chainfence" @@ -1208,7 +1208,7 @@ "description": "Build Chainlink Gate", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 150, + "time": "150 m", "components": [ [ [ "wire", 20 ] ], [ [ "steel_chunk", 3 ], [ "scrap", 12 ] ], [ [ "pipe", 20 ] ] ], "pre_note": "Needs to be supported on both sides by fencing, walls, etc.", "pre_special": "check_support", @@ -1220,7 +1220,7 @@ "//": "Step 1: 2x4 stud frame", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 5 ] ], [ [ "nail", 20 ] ] ], "pre_flags": "DIGGABLE", @@ -1232,7 +1232,7 @@ "//": "Step 2: chickenwire", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "components": [ [ [ "wire", 10 ] ] ], "pre_terrain": "t_chickenwire_fence_post", "post_terrain": "t_chickenwire_fence" @@ -1242,7 +1242,7 @@ "description": "Build Chickenwire Gate", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 45, + "time": "45 m", "components": [ [ [ "wire", 10 ] ], [ [ "2x4", 5 ] ], [ [ "nail", 20 ] ] ], "pre_note": "Needs to be supported on both sides by fencing, walls, etc.", "pre_special": "check_support", @@ -1253,7 +1253,7 @@ "description": "Seal Crate", "category": "FURN", "required_skills": [ [ "mechanics", 0 ] ], - "time": 10, + "time": "10 m", "//": "You can re-use the lid and most of the nails", "components": [ [ [ "nail", 6 ] ] ], "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ], @@ -1265,7 +1265,7 @@ "description": "Build Crate", "category": "FURN", "required_skills": [ [ "fabrication", 1 ] ], - "time": 45, + "time": "45 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], [ [ "nail", 24 ] ] ], "pre_special": "check_empty", @@ -1276,7 +1276,7 @@ "description": "Build Coffin", "category": "FURN", "required_skills": [ [ "fabrication", 1 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 12 ] ], @@ -1291,7 +1291,7 @@ "description": "Seal Coffin", "category": "FURN", "required_skills": [ [ "mechanics", 0 ] ], - "time": 10, + "time": "10 m", "components": [ [ [ "nail", 6 ] ] ], "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ], "pre_terrain": "f_coffin_o", @@ -1302,7 +1302,7 @@ "description": "Dig Grave and Bury Sealed Coffin", "category": "DIG", "required_skills": [ [ "fabrication", 0 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 1 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 20 ], [ "2x4", 2 ] ] ], "pre_flags": "DIGGABLE", @@ -1315,7 +1315,7 @@ "description": "Build Bulletin Board", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1326,7 +1326,7 @@ "description": "Build Dresser", "category": "FURN", "required_skills": [ [ "fabrication", 3 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1337,7 +1337,7 @@ "description": "Build Bookcase", "category": "FURN", "required_skills": [ [ "fabrication", 1 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 16 ] ] ], "pre_special": "check_empty", @@ -1348,7 +1348,7 @@ "description": "Build Locker", "category": "FURN", "required_skills": [ [ "fabrication", 4 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 8 ] ] ], "pre_special": "check_empty", @@ -1359,7 +1359,7 @@ "description": "Build Metal Rack", "category": "FURN", "required_skills": [ [ "fabrication", 2 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "pipe", 12 ] ], [ [ "sheet_metal", 2 ] ] ], "pre_special": "check_empty", @@ -1370,7 +1370,7 @@ "description": "Build Coat Rack", "category": "FURN", "required_skills": [ [ "fabrication", 2 ] ], - "time": 25, + "time": "25 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 3 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1381,7 +1381,7 @@ "description": "Build Cupboard", "category": "FURN", "required_skills": [ [ "fabrication", 3 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 3 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1392,7 +1392,7 @@ "description": "Build Counter", "category": "FURN", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1403,7 +1403,7 @@ "description": "Build Table", "category": "FURN", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1414,7 +1414,7 @@ "description": "Place Table", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 1, + "time": "1 m", "components": [ [ [ "w_table", 1 ] ] ], "pre_special": "check_empty", "post_terrain": "f_table" @@ -1424,7 +1424,7 @@ "description": "Build Workbench", "category": "FURN", "required_skills": [ [ "fabrication", 3 ] ], - "time": 60, + "time": "60 m", "using": [ [ "welding_standard", 5 ] ], "components": [ [ [ "pipe", 8 ] ], [ [ "sheet_metal", 2 ] ], [ [ "sheet_metal_small", 4 ] ] ], "pre_special": "check_empty", @@ -1435,7 +1435,7 @@ "description": "Place Workbench", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 1, + "time": "1 m", "components": [ [ [ "workbench", 1 ] ] ], "pre_special": "check_empty", "post_terrain": "f_workbench" @@ -1445,7 +1445,7 @@ "description": "Build Chair", "category": "FURN", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1456,7 +1456,7 @@ "description": "Build Stool", "category": "FURN", "required_skills": [ [ "fabrication", 2 ] ], - "time": 25, + "time": "25 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_special": "check_empty", @@ -1467,7 +1467,7 @@ "description": "Build Bench", "category": "FURN", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 10 ] ] ], "pre_special": "check_empty", @@ -1478,7 +1478,7 @@ "description": "Build Makeshift Bed", "category": "FURN", "required_skills": [ [ "fabrication", 2 ] ], - "time": 45, + "time": "45 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], @@ -1493,7 +1493,7 @@ "description": "Build Straw Bed", "category": "FURN", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "components": [ [ [ "2x4", 4 ] ], [ [ "straw_pile", 8 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", @@ -1504,7 +1504,7 @@ "description": "Build Bed", "category": "FURN", "required_skills": [ [ "fabrication", 4 ], [ "tailor", 4 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 12 ] ], @@ -1519,7 +1519,7 @@ "description": "Build Armchair", "category": "FURN", "required_skills": [ [ "fabrication", 3 ], [ "tailor", 3 ] ], - "time": 45, + "time": "45 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 10 ] ], [ [ "nail", 8 ] ], [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ] ], "pre_special": "check_empty", @@ -1530,7 +1530,7 @@ "description": "Build Sofa", "category": "FURN", "required_skills": [ [ "fabrication", 4 ], [ "tailor", 3 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ], [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ] ], "pre_special": "check_empty", @@ -1541,7 +1541,7 @@ "description": "Build Sign", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 20, + "time": "20 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 3 ] ], [ [ "nail", 6 ] ] ], "pre_special": "check_empty", @@ -1552,7 +1552,7 @@ "description": "Build Stone Fireplace", "category": "FURN", "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 40 ] ] ], "pre_special": "check_empty", @@ -1563,7 +1563,7 @@ "description": "Build Wood Stove", "category": "FURN", "required_skills": [ [ "fabrication", 5 ], [ "mechanics", 3 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "SAW_M", "level": 1 } ] ], "components": [ [ [ "metal_tank", 1 ] ], [ [ "pipe", 1 ] ] ], "pre_special": "check_empty", @@ -1574,7 +1574,7 @@ "description": "Build Fermenting Vat", "category": "FURN", "required_skills": [ [ "fabrication", 2 ], [ "cooking", 3 ] ], - "time": 90, + "time": "90 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 14 ] ], [ [ "nail", 12 ] ], [ [ "sheet_metal_small", 12 ] ], [ [ "water_faucet", 1 ] ] ], "pre_special": "check_empty", @@ -1585,7 +1585,7 @@ "description": "Build Wooden Keg", "category": "FURN", "required_skills": [ [ "fabrication", 2 ], [ "cooking", 2 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 18 ] ], [ [ "nail", 14 ] ], [ [ "sheet_metal", 1 ] ], [ [ "water_faucet", 1 ] ] ], "pre_special": "check_empty", @@ -1597,7 +1597,7 @@ "//": "a freestanding metal tank, useful for holding liquids", "category": "FURN", "required_skills": [ [ "fabrication", 2 ], [ "cooking", 1 ] ], - "time": 180, + "time": "180 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ], @@ -1613,7 +1613,7 @@ "description": "Place Forge", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 1, + "time": "1 m", "components": [ [ [ "char_forge", 1 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", @@ -1624,7 +1624,7 @@ "description": "Place Still", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 1, + "time": "1 m", "components": [ [ [ "still", 1 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", @@ -1635,7 +1635,7 @@ "description": "Build Water Well", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ], [ "survival", 4 ] ], - "time": 480, + "time": "480 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 40 ] ], [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ], "pre_terrain": "t_pit", @@ -1646,7 +1646,7 @@ "description": "Build Water Well", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ], [ "mechanics", 2 ] ], - "time": 180, + "time": "180 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "well_pump", 1 ] ], [ [ "pipe", 6 ] ] ], "pre_terrain": "t_covered_well", @@ -1657,7 +1657,7 @@ "description": "Place Hay Bale", "category": "FURN", "required_skills": [ [ "survival", 0 ] ], - "time": 10, + "time": "10 m", "components": [ [ [ "straw_pile", 40 ], [ "withered", 40 ] ], [ [ "rope_30", 1 ], [ "rope_makeshift_30", 1 ], [ "vine_30", 1 ] ] ], "pre_special": "check_empty", "post_terrain": "f_hay" @@ -1667,7 +1667,7 @@ "description": "Build Desk", "category": "FURN", "required_skills": [ [ "fabrication", 4 ] ], - "time": 90, + "time": "90 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ], [ { "id": "CUT", "level": 1 } ] ], "components": [ [ [ "2x4", 16 ] ], [ [ "nail", 24 ] ] ], "pre_special": "check_empty", @@ -1678,7 +1678,7 @@ "description": "Build Wardrobe", "category": "FURN", "required_skills": [ [ "fabrication", 4 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ], [ { "id": "SAW_M", "level": 1 } ] ], "components": [ [ [ "2x4", 20 ] ], [ [ "nail", 24 ] ], [ [ "pipe", 2 ] ] ], "pre_special": "check_empty", @@ -1689,7 +1689,7 @@ "description": "Paint Grass White", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "w_paint", 25 ] ] ], "pre_terrain": "t_grass", @@ -1700,7 +1700,7 @@ "description": "Paint Grass White", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "w_paint", 25 ] ] ], "pre_terrain": "t_grass_dead", @@ -1711,7 +1711,7 @@ "description": "Paint Grass White", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "w_paint", 25 ] ] ], "pre_terrain": "t_grass_golf", @@ -1722,7 +1722,7 @@ "description": "Paint Pavement Yellow", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "y_paint", 25 ] ] ], "pre_terrain": "t_pavement", @@ -1733,7 +1733,7 @@ "description": "Paint Pavement Yellow", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "y_paint", 25 ] ] ], "pre_terrain": "t_pavement_bg_dp", @@ -1744,7 +1744,7 @@ "description": "Take Paint Off Pavement", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 80, + "time": "80 m", "tools": [ [ "chipper" ] ], "pre_terrain": "t_pavement_y", "post_terrain": "t_pavement" @@ -1754,7 +1754,7 @@ "description": "Take Paint Off Pavement", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 80, + "time": "80 m", "tools": [ [ "chipper" ] ], "pre_terrain": "t_pavement_y_bg_dp", "post_terrain": "t_pavement_bg_dp" @@ -1764,7 +1764,7 @@ "description": "Build Wooden Railing", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 2 ] ], [ [ "nail", 6 ] ], [ [ "steel_chunk", 1 ], [ "scrap", 5 ] ] ], "pre_terrain": "t_floor", @@ -1775,7 +1775,7 @@ "description": "Cover Manhole", "category": "CONSTRUCT", "required_skills": [ [ "mechanics", 0 ] ], - "time": 1, + "time": "1 m", "components": [ [ [ "manhole_cover", 1 ] ] ], "pre_terrain": "t_manhole", "post_terrain": "t_manhole_cover" @@ -1785,7 +1785,7 @@ "description": "Remove Wax From Floor", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 80, + "time": "80 m", "tools": [ [ "chipper" ] ], "pre_terrain": "t_floor_waxed_y", "post_terrain": "t_floor" @@ -1795,7 +1795,7 @@ "description": "Paint Wall Red", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "r_paint", 25 ] ] ], "pre_terrain": "t_wall", @@ -1806,7 +1806,7 @@ "description": "Paint Wall Blue", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "b_paint", 25 ] ] ], "pre_terrain": "t_wall", @@ -1817,7 +1817,7 @@ "description": "Paint Wall white", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "w_paint", 25 ] ] ], "pre_terrain": "t_wall", @@ -1828,7 +1828,7 @@ "description": "Paint Wall Green", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "g_paint", 25 ] ] ], "pre_terrain": "t_wall", @@ -1839,7 +1839,7 @@ "description": "Paint Wall Purple", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "p_paint", 25 ] ] ], "pre_terrain": "t_wall", @@ -1850,7 +1850,7 @@ "description": "Paint Wall Yellow", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "tools": [ [ "paint_brush" ] ], "components": [ [ [ "y_paint", 25 ] ] ], "pre_terrain": "t_wall", @@ -1862,7 +1862,7 @@ "//": "For vertical walls", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 80, + "time": "80 m", "tools": [ [ "chipper" ] ], "pre_flags": "CHIP", "post_terrain": "t_wall" @@ -1872,7 +1872,7 @@ "description": "Remove Carpet", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "pre_flags": "RUG", "post_terrain": "t_floor" @@ -1882,7 +1882,7 @@ "description": "Carpet Floor Red", "category": "DECORATE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], "pre_terrain": "t_floor", @@ -1893,7 +1893,7 @@ "description": "Carpet Floor Purple", "category": "DECORATE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], "pre_terrain": "t_floor", @@ -1904,7 +1904,7 @@ "description": "Carpet Floor Yellow", "category": "DECORATE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], "pre_terrain": "t_floor", @@ -1915,7 +1915,7 @@ "description": "Carpet Floor Green", "category": "DECORATE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], "pre_terrain": "t_floor", @@ -1926,7 +1926,7 @@ "description": "Wax Floor", "category": "DECORATE", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "tools": [ [ [ "mop", -1 ], [ "paint_brush", -1 ] ], [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "wax", 5 ] ] ], "pre_terrain": "t_floor", @@ -1937,7 +1937,7 @@ "description": "Remove Wax From Floor", "category": "DECORATE", "required_skills": [ [ "fabrication", 0 ] ], - "time": 80, + "time": "80 m", "tools": [ [ "chipper" ] ], "pre_terrain": "t_floor_waxed", "post_terrain": "t_floor" @@ -1947,7 +1947,7 @@ "description": "Dig Downstair", "category": "DIG", "required_skills": [ [ "fabrication", 5 ], [ "survival", 3 ] ], - "time": 420, + "time": "420 m", "qualities": [ [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ], @@ -1963,7 +1963,7 @@ "description": "Mine Downstair", "category": "DIG", "required_skills": [ [ "fabrication", 6 ], [ "survival", 4 ] ], - "time": 480, + "time": "480 m", "qualities": [ [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ], @@ -1980,7 +1980,7 @@ "description": "Mine Upstair", "category": "DIG", "required_skills": [ [ "fabrication", 6 ], [ "survival", 4 ] ], - "time": 480, + "time": "480 m", "qualities": [ [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ], @@ -2012,11 +2012,10 @@ { "type": "construction", "description": "Start Vehicle Construction", - "//": "Rest of vehicle construction done in the vehicle construction menu", + "//": "no components required, they are filled in at runtime based on the vehicle parts that can be used to start a vehicle", "category": "OTHER", "required_skills": [ [ "mechanics", 0 ] ], - "time": 10, - "//": "no components required, they are filled in at runtime based on the vehicle parts that can be used to start a vehicle", + "time": "10 m", "pre_special": "check_empty", "post_special": "done_vehicle", "vehicle_start": true @@ -2026,7 +2025,7 @@ "description": "Build Road Barricade", "category": "OTHER", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 12 ] ] ], "pre_special": "check_empty", @@ -2038,7 +2037,7 @@ "//": "Set up pontoon bridge", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], - "time": 80, + "time": "80 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], @@ -2054,7 +2053,7 @@ "//": "Set up River bridge", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], - "time": 80, + "time": "80 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], @@ -2070,7 +2069,7 @@ "//": "Set up dock", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 80, + "time": "80 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ], "pre_terrain": "t_water_moving_sh", @@ -2082,7 +2081,7 @@ "//": "Set up Water Mill", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 40, + "time": "40 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "water_mill", 1 ] ] ], "pre_terrain": "t_water_moving_sh", @@ -2094,7 +2093,7 @@ "//": "Set up Wind Mill", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], - "time": 40, + "time": "40 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "components": [ [ [ "wind_mill", 1 ] ] ], "pre_terrain": "t_pit_shallow", @@ -2106,7 +2105,7 @@ "//": "Set up shallow bridge", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 80, + "time": "80 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ], "pre_terrain": "t_water_sh", @@ -2117,7 +2116,7 @@ "description": "Build Planter", "catergory": "FURN", "required_skills": [ [ "fabrication", 3 ] ], - "time": 25, + "time": "25 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 36 ] ], [ [ "pebble", 200 ] ], [ [ "material_soil", 75 ] ] ], "post_terrain": "f_planter" @@ -2127,7 +2126,7 @@ "description": "Cut Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "byproducts": [ { "item": "straw_pile" } ], "pre_terrain": "t_grass_long", "post_terrain": "t_grass", @@ -2138,7 +2137,7 @@ "description": "Cut Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "byproducts": [ { "item": "straw_pile", "count": [ 1, 2 ] } ], "pre_terrain": "t_grass_tall", "post_terrain": "t_grass", @@ -2149,7 +2148,7 @@ "description": "Remove Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "straw_pile", "count": [ 0, 1 ] } ], "pre_terrain": "t_grass", @@ -2160,7 +2159,7 @@ "description": "Remove Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "straw_pile" } ], "pre_terrain": "t_grass_long", @@ -2171,7 +2170,7 @@ "description": "Remove Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "straw_pile", "count": [ 1, 2 ] } ], "pre_terrain": "t_grass_tall", @@ -2182,7 +2181,7 @@ "description": "Remove Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "straw_pile", "count": [ 0, 1 ] } ], "pre_terrain": "t_grass_dead", @@ -2193,7 +2192,7 @@ "description": "Remove Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "pre_terrain": "t_grass_golf", "post_terrain": "t_dirt" @@ -2203,7 +2202,7 @@ "description": "Remove Grass", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 6, + "time": "6 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "pre_terrain": "t_grass_white", "post_terrain": "t_dirt" @@ -2213,7 +2212,7 @@ "description": "Extract Sand", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "material_sand", "charges": [ 300, 600 ] } ], "pre_terrain": "t_sand", @@ -2224,7 +2223,7 @@ "description": "Extract Clay", "category": "OTHER", "required_skills": [ [ "survival", 0 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "clay_lump", "count": [ 6, 12 ] } ], "pre_terrain": "t_clay", @@ -2235,7 +2234,7 @@ "description": "Build Charcoal Kiln", "category": "FURN", "required_skills": [ [ "fabrication", 3 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 40 ] ] ], "pre_note": "Can be deconstructed without tools.", @@ -2247,7 +2246,7 @@ "description": "Build Metal Charcoal Kiln", "category": "FURN", "required_skills": [ [ "fabrication", 3 ] ], - "time": 60, + "time": "60 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ], "components": [ [ [ "metal_tank", 4 ] ], [ [ "pipe", 4 ] ] ], "pre_special": "check_empty", @@ -2258,7 +2257,7 @@ "description": "Build Smoking Rack", "category": "FURN", "required_skills": [ [ "fabrication", 3 ], [ "cooking", 2 ] ], - "time": 90, + "time": "90 m", "qualities": [ [ { "id": "DIG", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ], @@ -2275,7 +2274,7 @@ "description": "Build Rock Forge", "category": "FURN", "required_skills": [ [ "fabrication", 5 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "rock", 40 ] ] ], "pre_note": "Can be deconstructed without tools.", @@ -2287,7 +2286,7 @@ "description": "Build Clay Kiln", "category": "FURN", "required_skills": [ [ "fabrication", 4 ] ], - "time": 150, + "time": "150 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "rock", 40 ] ], @@ -2304,7 +2303,7 @@ "//": "Step 1 : metal frame", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 7 ] ], - "time": 90, + "time": "90 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ], "components": [ [ [ "spike", 8 ] ], [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ] ], "pre_special": "check_empty", @@ -2316,7 +2315,7 @@ "//": "Step 2 : Reinforced Glass", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 8 ] ], - "time": 150, + "time": "150 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ], "components": [ [ [ "reinforced_glass_sheet", 1 ] ] ], "pre_terrain": "t_m_frame", @@ -2328,7 +2327,7 @@ "//": "Step 3 : Metal shutters", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 8 ] ], - "time": 150, + "time": "150 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ], "components": [ [ [ "steel_plate", 2 ] ] ], "pre_terrain": "t_reinforced_glass", @@ -2339,7 +2338,7 @@ "description": "Build Root Cellar", "category": "CONSTRUCT", "required_skills": [ [ "survival", 4 ], [ "fabrication", 4 ] ], - "time": 130, + "time": "130 m", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "rock", 40 ], [ "brick", 40 ] ], [ [ "2x4", 6 ], [ "stick", 6 ] ], [ [ "withered", 12 ], [ "straw_pile", 12 ] ] ], "pre_note": "You need a deep pit to construct a root cellar.", @@ -2351,7 +2350,7 @@ "description": "Mark firewood source", "category": "OTHER", "required_skills": [ ], - "time": 0, + "time": "0 m", "pre_note": "Firewood or other flammable materials on a nearby tile marked in this way may be used to automatically refuel fires. This will be done to maintain light during long-running tasks that require it such as crafting or reading, but not (for example) if you are simply waiting nearby.", "pre_special": "check_no_trap", "post_special": "done_mark_firewood" @@ -2361,7 +2360,7 @@ "description": "Mark practice target", "category": "OTHER", "required_skills": [ ], - "time": 0, + "time": "0 m", "pre_note": "Mark a spot for target practice. Firing will automatically target the first practice target location found in gun range, if no enemies are around.", "pre_special": "check_no_trap", "post_special": "done_mark_practice_target" @@ -2371,7 +2370,7 @@ "description": "Build Butchering Rack", "category": "FURN", "required_skills": [ [ "fabrication", 1 ], [ "survival", 3 ] ], - "time": 45, + "time": "45 m", "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "stick_long", 6 ] ], @@ -2387,7 +2386,7 @@ "description": "Build Junk Metal Barrier", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "DIG", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ], @@ -2407,7 +2406,7 @@ "description": "Reinforce Junk Metal Wall using bolts", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ], @@ -2434,7 +2433,7 @@ "description": "Reinforce Junk Metal Wall using spot-welds", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 90, + "time": "90 m", "qualities": [ [ { "id": "SAW_M", "level": 1 } ] ], "using": [ [ "welding_standard", 2 ] ], "components": [ @@ -2456,7 +2455,7 @@ "description": "Build Junk Metal Floor", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ], @@ -2483,7 +2482,7 @@ "description": "Build Pillow Fort", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 15, + "time": "15 m", "pre_special": "check_empty", "components": [ [ [ "pillow", 19 ], [ "down_pillow", 19 ] ], [ [ "down_blanket", 3 ], [ "blanket", 3 ], [ "fur_blanket", 3 ] ] ], "pre_terrain": "t_floor", @@ -2494,7 +2493,7 @@ "description": "Build Fire Ring", "category": "FURN", "required_skills": [ [ "survival", 0 ] ], - "time": 15, + "time": "15 m", "components": [ [ [ "rock", 20 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_terrain": "t_pit_shallow", @@ -2505,7 +2504,7 @@ "description": "Build Rammed Earth Wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ], - "time": 360, + "time": "360 m", "qualities": [ { "id": "HAMMER", "level": 2 } ], "tools": [ [ "frame_wood_light" ], [ "log" ] ], "components": [ @@ -2521,7 +2520,7 @@ "description": "Build Counter Gate", "category": "FURN", "required_skills": [ [ "fabrication", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 10 ] ] ], "pre_special": "check_empty", @@ -2532,7 +2531,7 @@ "description": "Build Split Rail Fence Gate", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "pointy_stick", 2 ], [ "spear_wood", 2 ] ], [ [ "2x4", 5 ] ], [ [ "nail", 12 ] ] ], "pre_flags": "DIGGABLE", @@ -2543,7 +2542,7 @@ "description": "Build Privacy Fence Gate", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "pointy_stick", 2 ], [ "spear_wood", 2 ] ], [ [ "2x4", 8 ] ], [ [ "nail", 20 ] ] ], "pre_flags": "DIGGABLE", @@ -2554,7 +2553,7 @@ "description": "Build Split Rail Fence", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "pointy_stick", 2 ], [ "spear_wood", 2 ] ], [ [ "2x4", 4 ] ], [ [ "nail", 20 ] ] ], "pre_flags": "DIGGABLE", @@ -2565,7 +2564,7 @@ "description": "Build Privacy Fence", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ], - "time": 30, + "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "pointy_stick", 2 ], [ "spear_wood", 2 ] ], [ [ "2x4", 8 ] ], [ [ "nail", 20 ] ] ], "pre_flags": "DIGGABLE", diff --git a/data/json/emit.json b/data/json/emit.json index d8e96946b8ef7..42db5caf96584 100644 --- a/data/json/emit.json +++ b/data/json/emit.json @@ -90,6 +90,20 @@ "field": "fd_electricity", "qty": 40 }, + { + "id": "emit_cold_air2_stream", + "type": "emit", + "//": "Medium cold air emitter", + "field": "fd_cold_air2", + "qty": 50 + }, + { + "id": "emit_cold_air2_blast", + "type": "emit", + "//": "Large cold air emitter", + "field": "fd_cold_air2", + "qty": 100 + }, { "id": "emit_hot_air2_stream", "type": "emit", diff --git a/data/json/item_actions.json b/data/json/item_actions.json index 8f11bc7ac2ef0..3ec9d9dea5092 100644 --- a/data/json/item_actions.json +++ b/data/json/item_actions.json @@ -199,6 +199,11 @@ "id": "countdown", "name": "Start countdown" }, + { + "type": "item_action", + "id": "learn_spell", + "name": "Learn spell" + }, { "type": "item_action", "id": "holster", diff --git a/data/json/items/book/archery.json b/data/json/items/book/archery.json index 3e929fc0b8e8d..788dfd0bf3614 100644 --- a/data/json/items/book/archery.json +++ b/data/json/items/book/archery.json @@ -14,7 +14,7 @@ "skill": "archery", "max_level": 2, "intelligence": 7, - "time": 20 + "time": "20 m" }, { "id": "mag_archery", @@ -31,7 +31,7 @@ "skill": "archery", "max_level": 1, "intelligence": 2, - "time": 7, + "time": "7 m", "fun": 1 }, { @@ -49,6 +49,6 @@ "skill": "archery", "max_level": 3, "intelligence": 7, - "time": 20 + "time": "20 m" } ] diff --git a/data/json/items/book/barter.json b/data/json/items/book/barter.json index b3b8b7ad9b4e5..82a886059ecdd 100644 --- a/data/json/items/book/barter.json +++ b/data/json/items/book/barter.json @@ -13,7 +13,7 @@ "skill": "barter", "max_level": 1, "intelligence": 5, - "time": 8 + "time": "8 m" }, { "id": "manual_business", @@ -30,7 +30,7 @@ "skill": "barter", "max_level": 3, "intelligence": 6, - "time": 25, + "time": "25 m", "fun": -1 }, { @@ -51,7 +51,7 @@ "required_level": 3, "max_level": 6, "intelligence": 9, - "time": 30, + "time": "30 m", "fun": -1 } ] diff --git a/data/json/items/book/bashing.json b/data/json/items/book/bashing.json index 5b9f8c7a07450..42a0e261729db 100644 --- a/data/json/items/book/bashing.json +++ b/data/json/items/book/bashing.json @@ -14,7 +14,7 @@ "skill": "bashing", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -31,6 +31,6 @@ "skill": "bashing", "max_level": 3, "intelligence": 3, - "time": 18 + "time": "18 m" } ] diff --git a/data/json/items/book/computer.json b/data/json/items/book/computer.json index 731e888304356..0e08597cc5f14 100644 --- a/data/json/items/book/computer.json +++ b/data/json/items/book/computer.json @@ -15,7 +15,7 @@ "required_level": 5, "max_level": 8, "intelligence": 13, - "time": 50, + "time": "50 m", "fun": -1 }, { @@ -35,7 +35,7 @@ "required_level": 3, "max_level": 5, "intelligence": 11, - "time": 35, + "time": "35 m", "fun": -2 }, { @@ -53,7 +53,7 @@ "skill": "computer", "max_level": 2, "intelligence": 5, - "time": 15 + "time": "15 m" }, { "id": "mag_computer", @@ -70,7 +70,7 @@ "skill": "computer", "max_level": 1, "intelligence": 5, - "time": 8 + "time": "8 m" }, { "id": "manual_computers", @@ -88,7 +88,7 @@ "skill": "computer", "max_level": 3, "intelligence": 5, - "time": 15 + "time": "15 m" }, { "id": "textbook_computer", @@ -107,7 +107,7 @@ "required_level": 3, "max_level": 6, "intelligence": 11, - "time": 35, + "time": "35 m", "fun": -2 } ] diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index 36283353b013c..7e3287297d9b2 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -16,7 +16,7 @@ "required_level": 5, "max_level": 8, "intelligence": 12, - "time": 35, + "time": "35 m", "fun": -1 }, { @@ -35,7 +35,7 @@ "required_level": 2, "max_level": 4, "intelligence": 8, - "time": 15, + "time": "15 m", "fun": 1 }, { @@ -52,7 +52,7 @@ "skill": "cooking", "max_level": 3, "intelligence": 4, - "time": 10 + "time": "10 m" }, { "id": "cookbook_human", @@ -71,7 +71,7 @@ "required_level": 2, "max_level": 4, "intelligence": 4, - "time": 10, + "time": "10 m", "fun": -5 }, { @@ -90,7 +90,7 @@ "required_level": 3, "max_level": 4, "intelligence": 6, - "time": 10 + "time": "10 m" }, { "id": "cookbook_sushi", @@ -109,7 +109,7 @@ "required_level": 1, "max_level": 4, "intelligence": 7, - "time": 20 + "time": "20 m" }, { "id": "family_cookbook", @@ -127,7 +127,7 @@ "required_level": 1, "max_level": 5, "intelligence": 7, - "time": 45, + "time": "45 m", "fun": 1 }, { @@ -145,7 +145,7 @@ "skill": "cooking", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -162,7 +162,7 @@ "skill": "cooking", "max_level": 1, "intelligence": 5, - "time": 24, + "time": "24 m", "fun": 1 }, { @@ -181,7 +181,7 @@ "required_level": 3, "max_level": 4, "intelligence": 4, - "time": 18 + "time": "18 m" }, { "id": "recipe_alpha", @@ -199,7 +199,7 @@ "required_level": 8, "max_level": 9, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -2 }, { @@ -218,7 +218,7 @@ "required_level": 8, "max_level": 9, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -2 }, { @@ -237,7 +237,7 @@ "required_level": 8, "max_level": 9, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -2 }, { @@ -256,7 +256,7 @@ "required_level": 8, "max_level": 9, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -4 }, { @@ -274,7 +274,7 @@ "required_level": 9, "max_level": 9, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -2 }, { @@ -293,7 +293,7 @@ "required_level": 5, "max_level": 8, "intelligence": 11, - "time": 35, + "time": "35 m", "fun": -1 }, { @@ -312,7 +312,7 @@ "required_level": 8, "max_level": 9, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -3 }, { @@ -332,7 +332,7 @@ "required_level": 8, "max_level": 9, "intelligence": 12, - "time": 35, + "time": "35 m", "fun": -2 }, { @@ -351,7 +351,7 @@ "required_level": 10, "max_level": 10, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -2 }, { @@ -370,7 +370,7 @@ "required_level": 8, "max_level": 10, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -4 }, { @@ -391,7 +391,7 @@ "required_level": 2, "max_level": 4, "intelligence": 10, - "time": 45, + "time": "45 m", "fun": -1 }, { @@ -410,7 +410,7 @@ "required_level": 3, "max_level": 6, "intelligence": 12, - "time": 35, + "time": "35 m", "fun": -1 } ] diff --git a/data/json/items/book/cutting.json b/data/json/items/book/cutting.json index 96a7e44334423..ab055fecc1354 100644 --- a/data/json/items/book/cutting.json +++ b/data/json/items/book/cutting.json @@ -14,7 +14,7 @@ "skill": "cutting", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -32,7 +32,7 @@ "skill": "cutting", "max_level": 3, "intelligence": 4, - "time": 18 + "time": "18 m" }, { "id": "manual_knives", @@ -50,6 +50,6 @@ "required_level": 1, "max_level": 4, "intelligence": 4, - "time": 18 + "time": "18 m" } ] diff --git a/data/json/items/book/dodge.json b/data/json/items/book/dodge.json index ff54fc968b25e..76891c512c478 100644 --- a/data/json/items/book/dodge.json +++ b/data/json/items/book/dodge.json @@ -14,7 +14,7 @@ "skill": "dodge", "max_level": 1, "intelligence": 2, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -32,7 +32,7 @@ "skill": "dodge", "max_level": 3, "intelligence": 7, - "time": 20 + "time": "20 m" }, { "id": "manual_dodge_kid", @@ -49,7 +49,7 @@ "skill": "dodge", "max_level": 1, "intelligence": 1, - "time": 6, + "time": "6 m", "fun": 1 } ] diff --git a/data/json/items/book/driving.json b/data/json/items/book/driving.json index 8bafc508fd623..55fbc0be258ee 100644 --- a/data/json/items/book/driving.json +++ b/data/json/items/book/driving.json @@ -14,7 +14,7 @@ "skill": "driving", "max_level": 3, "intelligence": 6, - "time": 30, + "time": "30 m", "fun": 2 }, { @@ -31,7 +31,7 @@ "skill": "driving", "max_level": 1, "intelligence": 2, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -49,7 +49,7 @@ "skill": "driving", "max_level": 3, "intelligence": 5, - "time": 16 + "time": "16 m" }, { "id": "textbook_anarch", @@ -66,7 +66,7 @@ "skill": "driving", "max_level": 4, "intelligence": 9, - "time": 45, + "time": "45 m", "fun": 1 } ] diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json index 0bbf73bfb7a10..00f5843f5dc48 100644 --- a/data/json/items/book/electronics.json +++ b/data/json/items/book/electronics.json @@ -16,7 +16,7 @@ "required_level": 2, "max_level": 5, "intelligence": 11, - "time": 35, + "time": "35 m", "fun": -1 }, { @@ -34,7 +34,7 @@ "skill": "electronics", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -52,7 +52,7 @@ "skill": "electronics", "max_level": 3, "intelligence": 7, - "time": 20 + "time": "20 m" }, { "id": "radio_book", @@ -71,7 +71,7 @@ "required_level": 4, "max_level": 8, "intelligence": 11, - "time": 35, + "time": "35 m", "fun": -1 }, { @@ -89,7 +89,7 @@ "required_level": 6, "max_level": 6, "intelligence": 12, - "time": 60, + "time": "60 m", "fun": -3 }, { @@ -108,7 +108,7 @@ "required_level": 4, "max_level": 5, "intelligence": 9, - "time": 45, + "time": "45 m", "fun": 1 }, { @@ -127,7 +127,7 @@ "required_level": 5, "max_level": 8, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -2 }, { @@ -146,7 +146,7 @@ "required_level": 6, "max_level": 7, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": 1 }, { @@ -165,7 +165,7 @@ "skill": "electronics", "required_level": 2, "intelligence": 10, - "time": 20, + "time": "20 m", "fun": -1 }, { @@ -185,7 +185,7 @@ "required_level": 3, "max_level": 6, "intelligence": 12, - "time": 35, + "time": "35 m", "fun": -1 }, { @@ -205,7 +205,7 @@ "required_level": 5, "max_level": 10, "intelligence": 13, - "time": 55, + "time": "55 m", "fun": -1 }, { @@ -222,7 +222,7 @@ "required_level": 7, "max_level": 7, "intelligence": 8, - "time": 55, + "time": "55 m", "symbol": "ç", "color": "blue" }, diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json index c1310a4508e18..70844c0a59edc 100644 --- a/data/json/items/book/fabrication.json +++ b/data/json/items/book/fabrication.json @@ -16,7 +16,7 @@ "required_level": 4, "max_level": 7, "intelligence": 8, - "time": 30 + "time": "30 m" }, { "id": "jewelry_book", @@ -34,7 +34,7 @@ "required_level": 6, "max_level": 6, "intelligence": 8, - "time": 60 + "time": "60 m" }, { "id": "mag_fabrication", @@ -51,7 +51,7 @@ "skill": "fabrication", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 2 }, { @@ -69,7 +69,7 @@ "skill": "fabrication", "max_level": 3, "intelligence": 5, - "time": 16, + "time": "16 m", "fun": 1 }, { @@ -88,7 +88,7 @@ "required_level": 2, "max_level": 4, "intelligence": 8, - "time": 30 + "time": "30 m" }, { "id": "recipe_bows", @@ -106,7 +106,7 @@ "required_level": 3, "max_level": 5, "intelligence": 8, - "time": 30 + "time": "30 m" }, { "id": "recipe_bullets", @@ -124,7 +124,7 @@ "required_level": 3, "max_level": 6, "intelligence": 9, - "time": 30 + "time": "30 m" }, { "id": "recipe_caseless", @@ -141,7 +141,7 @@ "required_level": 6, "max_level": 7, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": 1 }, { @@ -160,7 +160,7 @@ "required_level": 9, "max_level": 10, "intelligence": 12, - "time": 45, + "time": "45 m", "fun": -1 }, { @@ -178,7 +178,7 @@ "required_level": 5, "max_level": 6, "intelligence": 8, - "time": 20 + "time": "20 m" }, { "id": "recipe_mininuke_launch", @@ -196,7 +196,7 @@ "required_level": 4, "max_level": 5, "intelligence": 9, - "time": 10 + "time": "10 m" }, { "id": "textbook_armeast", @@ -214,7 +214,7 @@ "required_level": 5, "max_level": 10, "intelligence": 9, - "time": 60, + "time": "60 m", "fun": -1 }, { @@ -233,7 +233,7 @@ "required_level": 5, "max_level": 10, "intelligence": 9, - "time": 55, + "time": "55 m", "fun": -1 }, { @@ -252,7 +252,7 @@ "required_level": 5, "max_level": 10, "intelligence": 9, - "time": 60, + "time": "60 m", "fun": -1 }, { @@ -271,7 +271,7 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 30 + "time": "30 m" }, { "id": "textbook_fireman", @@ -289,7 +289,7 @@ "required_level": 7, "max_level": 9, "intelligence": 8, - "time": 10 + "time": "10 m" }, { "id": "textbook_gaswarfare", @@ -307,7 +307,7 @@ "required_level": 4, "max_level": 7, "intelligence": 9, - "time": 10, + "time": "10 m", "fun": -2 }, { @@ -326,7 +326,7 @@ "required_level": 5, "max_level": 10, "intelligence": 9, - "time": 55, + "time": "55 m", "fun": -1 }, { @@ -345,7 +345,7 @@ "required_level": 5, "max_level": 10, "intelligence": 9, - "time": 55, + "time": "55 m", "fun": -1 }, { @@ -365,7 +365,7 @@ "required_level": 4, "max_level": 7, "intelligence": 9, - "time": 30 + "time": "30 m" }, { "id": "101_carpentry", @@ -382,7 +382,7 @@ "skill": "fabrication", "max_level": 2, "intelligence": 5, - "time": 16 + "time": "16 m" }, { "id": "carpentry_book", @@ -401,7 +401,7 @@ "required_level": 5, "max_level": 8, "intelligence": 9, - "time": 55, + "time": "55 m", "fun": -1 }, { @@ -419,7 +419,7 @@ "skill": "fabrication", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -437,7 +437,7 @@ "skill": "fabrication", "max_level": 3, "intelligence": 5, - "time": 16 + "time": "16 m" }, { "id": "textbook_carpentry", @@ -456,7 +456,7 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 30, + "time": "30 m", "fun": -1 } ] diff --git a/data/json/items/book/firstaid.json b/data/json/items/book/firstaid.json index 52b11a69428a3..0fc10a5ed8341 100644 --- a/data/json/items/book/firstaid.json +++ b/data/json/items/book/firstaid.json @@ -16,7 +16,7 @@ "required_level": 5, "max_level": 8, "intelligence": 10, - "time": 55, + "time": "55 m", "fun": -1 }, { @@ -34,7 +34,7 @@ "skill": "firstaid", "max_level": 1, "intelligence": 1, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -52,7 +52,7 @@ "skill": "firstaid", "max_level": 3, "intelligence": 7, - "time": 20 + "time": "20 m" }, { "id": "pocket_firstaid", @@ -69,7 +69,7 @@ "skill": "firstaid", "max_level": 2, "intelligence": 6, - "time": 20 + "time": "20 m" }, { "id": "textbook_firstaid", @@ -88,7 +88,7 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 30 + "time": "30 m" }, { "id": "booklet_firstaid", @@ -104,7 +104,7 @@ "color": "pink", "skill": "firstaid", "max_level": 1, - "time": 8, + "time": "8 m", "fun": 1 } ] diff --git a/data/json/items/book/gun.json b/data/json/items/book/gun.json index b0c74c76af79a..0e7aa764b6a72 100644 --- a/data/json/items/book/gun.json +++ b/data/json/items/book/gun.json @@ -14,7 +14,7 @@ "skill": "gun", "max_level": 1, "intelligence": 2, - "time": 7, + "time": "7 m", "fun": 1 }, { @@ -31,7 +31,7 @@ "skill": "gun", "max_level": 3, "intelligence": 3, - "time": 15 + "time": "15 m" }, { "id": "pocket_firearms", @@ -48,6 +48,6 @@ "skill": "gun", "max_level": 2, "intelligence": 6, - "time": 20 + "time": "20 m" } ] diff --git a/data/json/items/book/launcher.json b/data/json/items/book/launcher.json index 7ebbd64159971..2445c3c0b8710 100644 --- a/data/json/items/book/launcher.json +++ b/data/json/items/book/launcher.json @@ -14,7 +14,7 @@ "skill": "launcher", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -32,6 +32,6 @@ "skill": "launcher", "max_level": 3, "intelligence": 4, - "time": 18 + "time": "18 m" } ] diff --git a/data/json/items/book/mechanics.json b/data/json/items/book/mechanics.json index f7bb8c57a5056..95b59a2079295 100644 --- a/data/json/items/book/mechanics.json +++ b/data/json/items/book/mechanics.json @@ -16,7 +16,7 @@ "required_level": 4, "max_level": 8, "intelligence": 6, - "time": 30, + "time": "30 m", "fun": -1 }, { @@ -43,7 +43,7 @@ "skill": "mechanics", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 2 }, { @@ -60,7 +60,7 @@ "skill": "mechanics", "max_level": 3, "intelligence": 5, - "time": 18 + "time": "18 m" }, { "id": "textbook_biodiesel", @@ -79,7 +79,7 @@ "required_level": 3, "max_level": 6, "intelligence": 9, - "time": 30 + "time": "30 m" }, { "id": "textbook_mechanics", @@ -98,7 +98,7 @@ "required_level": 3, "max_level": 6, "intelligence": 6, - "time": 30, + "time": "30 m", "fun": -1 } ] diff --git a/data/json/items/book/melee.json b/data/json/items/book/melee.json index ca6f9f8a474d4..959a8d5a8073a 100644 --- a/data/json/items/book/melee.json +++ b/data/json/items/book/melee.json @@ -14,7 +14,7 @@ "skill": "melee", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 2 }, { @@ -31,6 +31,6 @@ "skill": "melee", "max_level": 3, "intelligence": 4, - "time": 18 + "time": "18 m" } ] diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json index 24e0356801328..a179a4b3ed0d6 100644 --- a/data/json/items/book/misc.json +++ b/data/json/items/book/misc.json @@ -11,7 +11,7 @@ "symbol": "?", "color": "green", "intelligence": 7, - "time": 18, + "time": "18 m", "chapters": 28, "fun": 2 }, @@ -29,7 +29,7 @@ "symbol": "?", "color": "light_green", "intelligence": 8, - "time": 30, + "time": "30 m", "fun": -1 }, { @@ -43,7 +43,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_cyan", - "time": 4, + "time": "4 m", "chapters": 4, "fun": 1 }, @@ -61,7 +61,7 @@ "symbol": "?", "color": "light_cyan", "intelligence": 5, - "time": 10 + "time": "10 m" }, { "id": "decoy_elfa", @@ -75,7 +75,7 @@ "symbol": "?", "color": "light_green", "intelligence": 8, - "time": 45, + "time": "45 m", "fun": -2 }, { @@ -91,7 +91,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 10, - "time": 26, + "time": "26 m", "chapters": 40, "fun": 3 }, @@ -108,7 +108,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 6, - "time": 18, + "time": "18 m", "chapters": 24, "fun": 3 }, @@ -126,7 +126,7 @@ "symbol": "?", "color": "green", "intelligence": 3, - "time": 1 + "time": "1 m" }, { "id": "mycenacean_hymns", @@ -140,7 +140,7 @@ "symbol": "?", "color": "cyan", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -156,7 +156,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -172,7 +172,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -188,7 +188,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -205,7 +205,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -221,7 +221,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -238,7 +238,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -255,7 +255,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -272,7 +272,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -289,7 +289,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -305,7 +305,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -322,7 +322,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -339,7 +339,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -356,7 +356,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -372,7 +372,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -388,7 +388,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -405,7 +405,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -422,7 +422,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -439,7 +439,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -454,7 +454,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_cyan", - "time": 7, + "time": "7 m", "fun": 2 }, { @@ -469,7 +469,7 @@ "symbol": "?", "color": "pink", "intelligence": 7, - "time": 8, + "time": "8 m", "fun": 2 }, { @@ -484,7 +484,7 @@ "symbol": "?", "color": "pink", "intelligence": 7, - "time": 10, + "time": "10 m", "fun": 2 }, { @@ -498,7 +498,7 @@ "material": [ "paper" ], "symbol": "?", "color": "pink", - "time": 10, + "time": "10 m", "chapters": 4, "fun": 1 }, @@ -516,7 +516,7 @@ "symbol": "?", "color": "light_cyan", "intelligence": 2, - "time": 10 + "time": "10 m" }, { "id": "news_regional", @@ -530,7 +530,7 @@ "symbol": "?", "color": "pink", "intelligence": 5, - "time": 5, + "time": "5 m", "fun": 1 }, { @@ -545,7 +545,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 4, - "time": 20, + "time": "20 m", "chapters": 16, "fun": 4 }, @@ -561,7 +561,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 4, - "time": 20, + "time": "20 m", "chapters": 16, "fun": 2 }, @@ -577,7 +577,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 4, - "time": 20, + "time": "20 m", "chapters": 16, "fun": 2 }, @@ -601,7 +601,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 6, - "time": 20, + "time": "20 m", "chapters": 24, "fun": 3 }, @@ -625,7 +625,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 25, + "time": "25 m", "chapters": 28, "fun": 4 }, @@ -641,7 +641,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 18, + "time": "18 m", "chapters": 28, "fun": 1 }, @@ -657,7 +657,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 5, - "time": 20, + "time": "20 m", "chapters": 20, "fun": 1 }, @@ -673,7 +673,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 20, + "time": "20 m", "chapters": 28, "fun": 4 }, @@ -689,7 +689,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 18, + "time": "18 m", "chapters": 28, "fun": 1 }, @@ -705,7 +705,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 18, + "time": "18 m", "chapters": 28, "fun": 4 }, @@ -721,7 +721,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 6, - "time": 18, + "time": "18 m", "chapters": 24, "fun": 3 }, @@ -737,7 +737,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 4, - "time": 20, + "time": "20 m", "chapters": 16, "fun": 4 }, @@ -753,7 +753,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 4, - "time": 15, + "time": "15 m", "chapters": 16, "fun": 2 }, @@ -769,7 +769,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 20, + "time": "20 m", "chapters": 28, "fun": 4 }, @@ -785,7 +785,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 36, + "time": "36 m", "chapters": 28, "fun": 2 }, @@ -801,7 +801,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 6, - "time": 20, + "time": "20 m", "chapters": 24, "fun": 3 }, @@ -817,7 +817,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 20, + "time": "20 m", "chapters": 28, "fun": 4 }, @@ -833,7 +833,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 5, - "time": 18, + "time": "18 m", "chapters": 20, "fun": 3 }, @@ -849,7 +849,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 20, + "time": "20 m", "chapters": 28, "fun": 4 }, @@ -865,7 +865,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 5, - "time": 18, + "time": "18 m", "chapters": 20, "fun": 3 }, @@ -881,7 +881,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 18, + "time": "18 m", "chapters": 28, "fun": 1 }, @@ -897,7 +897,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 20, + "time": "20 m", "chapters": 28, "fun": 4 }, @@ -921,7 +921,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 20, + "time": "20 m", "chapters": 28, "fun": 4 }, @@ -938,7 +938,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 11, - "time": 36, + "time": "36 m", "chapters": 44, "fun": 3 }, @@ -956,7 +956,7 @@ "symbol": "?", "color": "yellow", "intelligence": 4, - "time": 1, + "time": "1 m", "chapters": 200, "fun": -5 }, @@ -971,7 +971,7 @@ "material": [ "paper", "leather" ], "symbol": "?", "color": "light_gray", - "time": 10, + "time": "10 m", "chapters": 4, "fun": 1, "flags": [ "INSPIRATIONAL" ] @@ -989,7 +989,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 9, - "time": 18, + "time": "18 m", "chapters": 36, "fun": 2 }, @@ -1006,7 +1006,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 9, - "time": 18, + "time": "18 m", "chapters": 36, "fun": 2 }, @@ -1024,7 +1024,7 @@ "symbol": "?", "color": "light_gray", "intelligence": 15, - "time": 30, + "time": "30 m", "fun": -1, "flags": [ "INSPIRATIONAL" ] }, @@ -1041,7 +1041,7 @@ "symbol": "?", "color": "light_green", "intelligence": 10, - "time": 30, + "time": "30 m", "fun": -1 }, { @@ -1058,7 +1058,7 @@ "symbol": "?", "color": "light_green", "intelligence": 8, - "time": 30, + "time": "30 m", "fun": -1 }, { @@ -1075,7 +1075,7 @@ "symbol": "?", "color": "light_green", "intelligence": 4, - "time": 30, + "time": "30 m", "fun": -1 }, { @@ -1091,7 +1091,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 7, - "time": 48, + "time": "48 m", "chapters": 28, "fun": 5 }, @@ -1108,7 +1108,7 @@ "symbol": "?", "color": "light_blue", "intelligence": 6, - "time": 18, + "time": "18 m", "chapters": 24, "fun": 3 }, @@ -1126,7 +1126,7 @@ "symbol": "?", "color": "light_cyan", "intelligence": 6, - "time": 30, + "time": "30 m", "fun": 2, "flags": [ "INSPIRATIONAL" ] }, @@ -1143,7 +1143,7 @@ "symbol": "?", "color": "dark_gray", "intelligence": 8, - "time": 10, + "time": "10 m", "fun": 1, "flags": [ "INSPIRATIONAL" ] }, @@ -1235,7 +1235,7 @@ "color": "light_blue", "symbol": "?", "intelligence": 7, - "time": 28, + "time": "28 m", "chapters": 40, "fun": 3 }, @@ -1330,7 +1330,7 @@ "color": "light_blue", "symbol": "?", "intelligence": 7, - "time": 28, + "time": "28 m", "chapters": 40, "fun": 4 } diff --git a/data/json/items/book/pistol.json b/data/json/items/book/pistol.json index 8c1557bb9f888..c309f4160e47a 100644 --- a/data/json/items/book/pistol.json +++ b/data/json/items/book/pistol.json @@ -13,7 +13,7 @@ "skill": "pistol", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -31,6 +31,6 @@ "skill": "pistol", "max_level": 3, "intelligence": 3, - "time": 15 + "time": "15 m" } ] diff --git a/data/json/items/book/rifle.json b/data/json/items/book/rifle.json index 2b518ba7af640..8f1d37f30584d 100644 --- a/data/json/items/book/rifle.json +++ b/data/json/items/book/rifle.json @@ -14,7 +14,7 @@ "skill": "rifle", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -31,6 +31,6 @@ "skill": "rifle", "max_level": 3, "intelligence": 4, - "time": 18 + "time": "18 m" } ] diff --git a/data/json/items/book/shotgun.json b/data/json/items/book/shotgun.json index f2e5e34a3b561..6032cdb1b6d60 100644 --- a/data/json/items/book/shotgun.json +++ b/data/json/items/book/shotgun.json @@ -14,7 +14,7 @@ "skill": "shotgun", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -32,6 +32,6 @@ "skill": "shotgun", "max_level": 3, "intelligence": 3, - "time": 15 + "time": "15 m" } ] diff --git a/data/json/items/book/smg.json b/data/json/items/book/smg.json index 07672ec8e22ee..876e9a3563026 100644 --- a/data/json/items/book/smg.json +++ b/data/json/items/book/smg.json @@ -14,7 +14,7 @@ "skill": "smg", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -31,6 +31,6 @@ "skill": "smg", "max_level": 3, "intelligence": 3, - "time": 15 + "time": "15 m" } ] diff --git a/data/json/items/book/speech.json b/data/json/items/book/speech.json index 46fb4be1107b8..d94c969bd0614 100644 --- a/data/json/items/book/speech.json +++ b/data/json/items/book/speech.json @@ -14,7 +14,7 @@ "skill": "speech", "max_level": 1, "intelligence": 3, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -32,7 +32,7 @@ "skill": "speech", "max_level": 3, "intelligence": 5, - "time": 20 + "time": "20 m" }, { "id": "textbook_speech", @@ -51,7 +51,7 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 30 + "time": "30 m" }, { "id": "dnd_handbook", @@ -70,6 +70,6 @@ "skill": "speech", "max_level": 5, "intelligence": 9, - "time": 30 + "time": "30 m" } ] diff --git a/data/json/items/book/stabbing.json b/data/json/items/book/stabbing.json index d38e2e1497765..f80712b53ccd7 100644 --- a/data/json/items/book/stabbing.json +++ b/data/json/items/book/stabbing.json @@ -13,7 +13,7 @@ "skill": "stabbing", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -30,6 +30,6 @@ "skill": "stabbing", "max_level": 3, "intelligence": 4, - "time": 18 + "time": "18 m" } ] diff --git a/data/json/items/book/survival.json b/data/json/items/book/survival.json index f9d5fe880f816..456503b2f8b5e 100644 --- a/data/json/items/book/survival.json +++ b/data/json/items/book/survival.json @@ -16,7 +16,7 @@ "required_level": 1, "max_level": 8, "intelligence": 10, - "time": 55, + "time": "55 m", "fun": -3 }, { @@ -35,7 +35,7 @@ "required_level": 1, "max_level": 3, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 3 }, { @@ -53,7 +53,7 @@ "skill": "survival", "max_level": 1, "intelligence": 5, - "time": 24, + "time": "24 m", "fun": 1 }, { @@ -71,7 +71,7 @@ "skill": "survival", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 2 }, { @@ -89,7 +89,7 @@ "skill": "survival", "max_level": 3, "intelligence": 4, - "time": 18 + "time": "18 m" }, { "id": "pocket_survival", @@ -105,7 +105,7 @@ "skill": "survival", "max_level": 2, "intelligence": 6, - "time": 20 + "time": "20 m" }, { "id": "survival_book", @@ -125,7 +125,7 @@ "required_level": 5, "max_level": 8, "intelligence": 10, - "time": 55, + "time": "55 m", "fun": 1 }, { @@ -144,6 +144,6 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 30 + "time": "30 m" } ] diff --git a/data/json/items/book/swimming.json b/data/json/items/book/swimming.json index f0c0f5dbd286b..7eba15122803c 100644 --- a/data/json/items/book/swimming.json +++ b/data/json/items/book/swimming.json @@ -14,7 +14,7 @@ "skill": "swimming", "max_level": 1, "intelligence": 1, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -31,6 +31,6 @@ "skill": "swimming", "max_level": 3, "intelligence": 3, - "time": 15 + "time": "15 m" } ] diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json index 48f78acbb0e6a..87f0a1e0d73e5 100644 --- a/data/json/items/book/tailor.json +++ b/data/json/items/book/tailor.json @@ -21,7 +21,7 @@ "skill": "tailor", "max_level": 1, "intelligence": 5, - "time": 24, + "time": "24 m", "fun": 1 }, { @@ -39,7 +39,7 @@ "skill": "tailor", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 2 }, { @@ -57,7 +57,7 @@ "skill": "tailor", "max_level": 3, "intelligence": 4, - "time": 18 + "time": "18 m" }, { "id": "tailor_portfolio", @@ -75,7 +75,7 @@ "required_level": 5, "max_level": 8, "intelligence": 10, - "time": 55, + "time": "55 m", "fun": -1 }, { @@ -94,7 +94,7 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 40 + "time": "40 m" }, { "id": "recipe_fauxfur", @@ -112,7 +112,7 @@ "required_level": 2, "max_level": 5, "intelligence": 7, - "time": 20, + "time": "20 m", "fun": 1 }, { @@ -132,6 +132,6 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 30 + "time": "30 m" } ] diff --git a/data/json/items/book/throw.json b/data/json/items/book/throw.json index 9961002976bce..ab154acea7cb5 100644 --- a/data/json/items/book/throw.json +++ b/data/json/items/book/throw.json @@ -14,7 +14,7 @@ "skill": "throw", "max_level": 1, "intelligence": 1, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -32,6 +32,6 @@ "skill": "throw", "max_level": 3, "intelligence": 3, - "time": 15 + "time": "15 m" } ] diff --git a/data/json/items/book/traps.json b/data/json/items/book/traps.json index 13cc1203fd3dc..4e8b694f0479d 100644 --- a/data/json/items/book/traps.json +++ b/data/json/items/book/traps.json @@ -14,7 +14,7 @@ "skill": "traps", "max_level": 4, "intelligence": 4, - "time": 20 + "time": "20 m" }, { "id": "mag_traps", @@ -31,7 +31,7 @@ "skill": "traps", "max_level": 1, "intelligence": 5, - "time": 8 + "time": "8 m" }, { "id": "manual_traps", @@ -47,7 +47,7 @@ "skill": "traps", "max_level": 3, "intelligence": 4, - "time": 20 + "time": "20 m" }, { "id": "textbook_traps", @@ -67,7 +67,7 @@ "required_level": 3, "max_level": 6, "intelligence": 8, - "time": 30 + "time": "30 m" }, { "id": "trappers_companion", @@ -86,6 +86,6 @@ "required_level": 5, "max_level": 8, "intelligence": 10, - "time": 55 + "time": "55 m" } ] diff --git a/data/json/items/book/unarmed.json b/data/json/items/book/unarmed.json index dab9a31d40bb4..3ff0d045b33eb 100644 --- a/data/json/items/book/unarmed.json +++ b/data/json/items/book/unarmed.json @@ -14,7 +14,7 @@ "skill": "unarmed", "max_level": 1, "intelligence": 5, - "time": 8, + "time": "8 m", "fun": 1 }, { @@ -32,6 +32,6 @@ "skill": "unarmed", "max_level": 3, "intelligence": 3, - "time": 15 + "time": "15 m" } ] diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index 92af5e4bb3a9e..11670357ddfdc 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -36,7 +36,6 @@ "volume": 1, "phase": "liquid", "fun": 20, - "flags": [ "FREEZERBURN" ], "vitamins": [ [ "calcium", 8 ], [ "iron", 1 ] ] }, { diff --git a/data/json/items/gunmod/magazine.json b/data/json/items/gunmod/magazine.json index 11259c2cbcaec..2110ee445d050 100644 --- a/data/json/items/gunmod/magazine.json +++ b/data/json/items/gunmod/magazine.json @@ -14,7 +14,7 @@ "location": "magazine", "mod_targets": [ "pistol", "rifle" ], "acceptable_ammo": [ "9mm", "460", "223" ], - "install_time": 60000, + "install_time": "60 m", "magazine_adaptor": [ [ "9mm", [ "lw21mag" ] ], [ "460", [ "lw12mag" ] ], [ "223", [ "lw223mag", "lw223bigmag" ] ] ], "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ] ], "flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ] diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index e7eee248ed81a..caddedada9b82 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -14,7 +14,7 @@ "color": "dark_gray", "location": "mechanism", "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "launcher" ], - "install_time": 30000, + "install_time": "30 m", "dispersion_modifier": -1, "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ], [ "gun", 2 ] ] }, @@ -34,7 +34,7 @@ "location": "mechanism", "mod_targets": [ "ar15" ], "//": "Install time short since it drops in, hinging open the AR being all the 'skill' necessary. Precision drop marginal since it'd change how semi and FA trigger pulls feel.", - "install_time": 5000, + "install_time": "5 m", "dispersion_modifier": 10, "durability_modifier": -1, "mode_modifier": [ [ "AUTO", "auto", 13 ] ], @@ -55,7 +55,7 @@ "location": "mechanism", "mod_targets": [ "ar15" ], "//": "Sort of long install time. Gotta grind down the carrier trip to SP1-ish length. Unfortunately, since you're sort of guessing how long that is, the AR's timing with this installed will be borked.(disco might be disengaged at non-ideal times).", - "install_time": 25000, + "install_time": "25 m", "dispersion_modifier": 40, "consume_chance": 300, "consume_divisor": 110, @@ -78,7 +78,7 @@ "color": "dark_gray", "location": "mechanism", "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "launcher" ], - "install_time": 10000, + "install_time": "10 m", "min_skills": [ [ "weapon", 2 ] ], "flags": [ "WATERPROOF_GUN" ] } diff --git a/data/json/items/gunmod/muzzle.json b/data/json/items/gunmod/muzzle.json index be4f16fcdde83..7034c04495d27 100644 --- a/data/json/items/gunmod/muzzle.json +++ b/data/json/items/gunmod/muzzle.json @@ -154,7 +154,7 @@ "color": "dark_gray", "location": "muzzle", "mod_targets": [ "pistol", "smg", "rifle" ], - "install_time": 200, + "install_time": "0 m", "handling_modifier": 2, "consume_divisor": 840, "loudness_modifier": -50 @@ -189,7 +189,7 @@ "color": "dark_gray", "location": "muzzle", "mod_targets": [ "pistol", "smg" ], - "install_time": 200, + "install_time": "0 m", "consume_chance": 7000, "consume_divisor": 85, "handling_modifier": 1, diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json index 8eaaa35a4f4fb..323f988e11461 100644 --- a/data/json/items/gunmod/sights.json +++ b/data/json/items/gunmod/sights.json @@ -141,7 +141,7 @@ "color": "dark_gray", "location": "sights", "mod_targets": [ "rifle", "crossbow", "launcher" ], - "install_time": 30000, + "install_time": "30 m", "sight_dispersion": 0, "aim_speed": 0, "min_skills": [ [ "weapon", 2 ], [ "gun", 4 ] ], @@ -160,7 +160,7 @@ "color": "dark_gray", "location": "sights", "mod_targets": [ "rifle", "crossbow", "launcher" ], - "install_time": 30000, + "install_time": "30 m", "sight_dispersion": 8, "aim_speed": 2, "min_skills": [ [ "weapon", 2 ], [ "gun", 4 ] ], @@ -192,7 +192,7 @@ "color": "dark_gray", "location": "sights", "mod_targets": [ "smg", "rifle", "shotgun", "crossbow", "pistol", "launcher" ], - "install_time": 30000, + "install_time": "30 m", "consume_chance": 1000, "consume_divisor": 505, "sight_dispersion": 15, diff --git a/data/json/items/vehicle/cables.json b/data/json/items/vehicle/cables.json new file mode 100644 index 0000000000000..87059285b1b87 --- /dev/null +++ b/data/json/items/vehicle/cables.json @@ -0,0 +1,43 @@ +[ + { + "type": "TOOL", + "id": "jumper_cable", + "name": "jumper cable", + "description": "A jumper cable, like you've seen many times before: it's a short multi-stranded copper cable with power leads on either end, whose purpose is to share power between vehicles.", + "to_hit": 1, + "color": "light_blue", + "symbol": "&", + "material": [ "steel", "plastic" ], + "volume": 2, + "weight": 75, + "bashing": 2, + "category": "tools", + "price": 1, + "max_charges": 3, + "initial_charges": 3, + "use_action": "CABLE_ATTACH", + "flags": [ "CABLE_SPOOL" ] + }, + { + "type": "TOOL", + "id": "jumper_cable_heavy", + "name": "heavy-duty cable", + "description": "A long, thick, heavy-duty cable with power leads on either end. It looks like you could use it to hook up two vehicles to each other, though you expect the power loss would be noticeable.", + "volume": 6, + "weight": 750, + "max_charges": 20, + "initial_charges": 20, + "copy-from": "jumper_cable" + }, + { + "type": "TOOL", + "id": "jumper_cable_debug", + "name": "shiny cable", + "description": "This is the cable of the gods: 50 meters long, no power loss, light as a feather and fits in a matchbook. You're sure this wasn't supposed to exist, and the way it shimmers makes you uneasy.", + "weight": 1, + "volume": 0, + "max_charges": 50, + "initial_charges": 50, + "copy-from": "jumper_cable" + } +] diff --git a/data/json/items/vehicle/cargo.json b/data/json/items/vehicle/cargo.json new file mode 100644 index 0000000000000..83e4c03ee7865 --- /dev/null +++ b/data/json/items/vehicle/cargo.json @@ -0,0 +1,92 @@ +[ + { + "type": "GENERIC", + "id": "basket", + "name": "wire basket", + "description": "A large wire basket from a shopping cart.", + "weight": 6000, + "to_hit": -5, + "color": "cyan", + "symbol": "]", + "material": [ "steel" ], + "techniques": [ "DEF_DISARM" ], + "volume": 90, + "bashing": 20, + "category": "veh_parts", + "price": 10000, + "qualities": [ [ "COOK", 1 ] ] + }, + { + "type": "GENERIC", + "id": "folding_basket", + "name": "folding wire basket", + "description": "A large wire basket from a shopping cart, modified to be foldable.", + "weight": 7000, + "copy-from": "basket" + }, + { + "type": "GENERIC", + "id": "bike_basket", + "name": "bike basket", + "description": "A simple bike basket. It is small and foldable.", + "weight": 1200, + "volume": 20, + "price": 3500, + "copy-from": "basket" + }, + { + "type": "GENERIC", + "id": "cargo_rack", + "name": "cargo carrier", + "description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo.", + "weight": 80000, + "to_hit": -4, + "color": "cyan", + "symbol": "]", + "material": [ "steel", "plastic" ], + "volume": 200, + "bashing": 2, + "category": "veh_parts", + "price": 40000 + }, + { + "id": "cargo_aisle", + "type": "GENERIC", + "name": "floor trunk", + "description": "A section of flooring with a cargo-space beneath, and a hinged door for access.", + "weight": 18000, + "color": "cyan", + "symbol": "]", + "volume": 200, + "bashing": 2, + "material": [ "steel", "plastic" ], + "category": "veh_parts", + "price": 20000 + }, + { + "id": "livestock_carrier", + "type": "GENERIC", + "name": "livestock carrier", + "description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo, with additional railings to keep a large animal in place. It is meant to hold large animals for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", + "weight": 96000, + "volume": 250, + "price": 48000, + "category": "veh_parts", + "material": [ "steel", "plastic" ], + "symbol": "]", + "color": "light_gray", + "looks_like": "cargo_rack", + "properties": [ [ "monster_size_capacity", "HUGE" ] ], + "use_action": "CAPTURE_MONSTER_VEH", + "flags": [ "TRADER_AVOID", "USE_PART_ITEM" ] + }, + { + "id": "animal_locker", + "type": "GENERIC", + "copy-from": "livestock_carrier", + "name": "animal locker", + "description": "A locker used to contain animals safely during transportation if installed properly. There is room for animal food and other animal care goods. It is meant to hold medium or smaller animals for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", + "weight": 10000, + "volume": 125 + } +] diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json new file mode 100644 index 0000000000000..7373d4ff0bc06 --- /dev/null +++ b/data/json/items/vehicle/controls.json @@ -0,0 +1,72 @@ +[ + { + "type": "GENERIC", + "id": "vehicle_controls", + "name": "vehicle controls", + "name_plural": "sets of vehicle controls", + "description": "A set of various vehicle controls. Useful for crafting.", + "weight": 6000, + "to_hit": -4, + "color": "light_cyan", + "symbol": "$", + "material": [ "plastic", "steel" ], + "volume": 12, + "bashing": 2, + "category": "veh_parts", + "price": 40000 + }, + { + "type": "GENERIC", + "id": "vehicle_dashboard", + "name": "dashboard", + "description": "A vehicle instrument panel with various gauges and switches. Useful for crafting.", + "weight": 2721, + "to_hit": -2, + "color": "cyan", + "symbol": "$", + "material": [ "plastic", "steel" ], + "volume": 40, + "bashing": 1, + "category": "veh_parts", + "price": 8000 + }, + { + "type": "GENERIC", + "id": "electronics_controls", + "copy-from": "vehicle_dashboard", + "name": "electronics control unit", + "description": "A vehicle instrument panel with various gauges and switches. Useful for crafting.", + "weight": 1311, + "to_hit": -4, + "material": [ "plastic" ], + "volume": 6, + "price": 4000 + }, + { + "type": "GENERIC", + "id": "drive_by_wire_controls", + "name": "drive by wire controls", + "name_plural": "sets of drive by wire controls", + "description": "Fully electronic vehicle control system. You could control it remotely if you had proper tools.", + "weight": 3000, + "color": "red", + "volume": 15, + "bashing": 1, + "price": 200000, + "copy-from": "vehicle_controls" + }, + { + "type": "GENERIC", + "id": "robot_controls", + "name": "robot driving unit", + "name_plural": "robot driving units", + "description": "A set of servos, microcontrollers and other devices, together capable of driving an unmanned vehicle. Its AI is not functional, but it should still have some sort of maintenance mode.", + "weight": 2000, + "color": "white", + "symbol": "&", + "volume": 20, + "bashing": 1, + "price": 20000, + "copy-from": "vehicle_controls" + } +] diff --git a/data/json/items/vehicle/farming.json b/data/json/items/vehicle/farming.json new file mode 100644 index 0000000000000..6c3e9dc302dcc --- /dev/null +++ b/data/json/items/vehicle/farming.json @@ -0,0 +1,77 @@ +[ + { + "type": "GENERIC", + "id": "v_scoop_item", + "name": "vehicle scoop", + "symbol": "u", + "color": "light_gray", + "name_plural": "vehicle scoops", + "description": "An assembly of motors and sheet metal that allows a vehicle to clean the road surface by removing debris and contaminants.", + "weight": 22666, + "bashing": 1, + "material": "steel", + "category": "veh_parts", + "price": 3500, + "volume": 28 + }, + { + "type": "GENERIC", + "id": "v_planter_item", + "symbol": "8", + "name": "seed drill", + "name_plural": "seed drills", + "description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land.", + "material": [ "steel", "plastic" ], + "copy-from": "v_scoop_item" + }, + { + "type": "GENERIC", + "id": "v_reaper_item", + "symbol": "/", + "name": "reaper", + "name_plural": "reapers", + "description": "An assembly of a blade, wheels, and a small lever for engaging/disengaging used to cut down crops prior to picking them up.", + "material": [ "steel", "plastic" ], + "copy-from": "v_scoop_item" + }, + { + "type": "GENERIC", + "id": "v_reaper_item_advanced", + "symbol": "/", + "name": "advanced reaper", + "name_plural": "advanced reapers", + "description": "An advanced electronic device used to cut down, collect and store crops.", + "weight": 25000, + "material": [ "steel", "plastic" ], + "price": 50000, + "volume": 36, + "copy-from": "v_scoop_item" + }, + { + "type": "GENERIC", + "id": "v_planter_item_advanced", + "symbol": "8", + "name": "advanced seed drill", + "name_plural": "advanced seed drills", + "color": "dark_gray", + "description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land. This one is equipped with an electronic control system and will avoid damaging itself when used on untilled land.", + "weight": 32666, + "material": [ "steel", "plastic" ], + "price": 50000, + "volume": 29, + "copy-from": "v_scoop_item" + }, + { + "type": "GENERIC", + "id": "v_plow_item", + "symbol": "&", + "name": "plow", + "name_plural": "plows", + "color": "dark_gray", + "description": "A heavy assembly of wheels and steel blades that turn up the ground.", + "weight": 32666, + "material": [ "steel", "plastic" ], + "volume": 29, + "copy-from": "v_scoop_item" + } +] diff --git a/data/json/items/vehicle/frames.json b/data/json/items/vehicle/frames.json new file mode 100644 index 0000000000000..8a4ad1bad5f39 --- /dev/null +++ b/data/json/items/vehicle/frames.json @@ -0,0 +1,95 @@ +[ + { + "type": "GENERIC", + "id": "foldframe", + "name": "foldable-light frame", + "description": "A small foldable lightweight frame made from pipework.", + "weight": 5000, + "to_hit": -3, + "color": "light_gray", + "symbol": "]", + "material": [ "steel" ], + "techniques": [ "DEF_DISARM" ], + "volume": 40, + "bashing": 15, + "category": "veh_parts", + "price": 4000 + }, + { + "type": "GENERIC", + "id": "xlframe", + "name": "extra-light frame", + "description": "A small lightweight frame made from pipework. Useful for crafting.", + "material": [ "aluminum" ], + "copy-from": "foldframe" + }, + { + "type": "GENERIC", + "id": "frame", + "name": "steel frame", + "description": "A large frame made of steel. Useful for crafting.", + "weight": 20000, + "to_hit": -5, + "color": "cyan", + "volume": 60, + "bashing": 20, + "price": 5500, + "copy-from": "foldframe" + }, + { + "type": "GENERIC", + "id": "hdframe", + "name": "heavy duty frame", + "description": "A large, reinforced steel frame, used in military vehicle construction.", + "weight": 100000, + "to_hit": -6, + "color": "green", + "material": [ "hardsteel", "steel" ], + "volume": 80, + "bashing": 25, + "price": 12000, + "qualities": [ [ "ANVIL", 1 ] ], + "copy-from": "foldframe" + }, + { + "type": "GENERIC", + "id": "frame_wood", + "name": "wooden frame", + "description": "A large frame made of wood. Useful for crafting.", + "weight": 8000, + "to_hit": -5, + "color": "brown", + "material": [ "wood" ], + "volume": 60, + "bashing": 16, + "cutting": 4, + "price": 3500, + "copy-from": "foldframe" + }, + { + "type": "GENERIC", + "id": "foldwoodframe", + "name": "foldable wooden frame", + "description": "A small foldable frame made from scrap wood.", + "weight": 4000, + "color": "brown", + "material": [ "wood" ], + "volume": 50, + "copy-from": "foldframe" + }, + { + "type": "GENERIC", + "id": "frame_wood_light", + "name": "light wooden frame", + "description": "A small frame made of few pieces of wood, held together by rope. Useful for crafting.", + "weight": 4000, + "to_hit": -5, + "color": "brown", + "material": [ "wood" ], + "volume": 35, + "bashing": 8, + "cutting": 1, + "price": 1000, + "copy-from": "foldframe" + } +] diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json new file mode 100644 index 0000000000000..0a6f57a7f6eb4 --- /dev/null +++ b/data/json/items/vehicle/lights.json @@ -0,0 +1,92 @@ +[ + { + "id": "car_headlight", + "type": "GENERIC", + "name": "car headlight", + "description": "A vehicle headlight to light up the way.", + "symbol": ";", + "color": "white", + "material": "plastic", + "category": "veh_parts", + "weight": 1000, + "volume": 4, + "price": 3000 + }, + { + "id": "car_wide_headlight", + "type": "GENERIC", + "name": "wide-angle car headlight", + "description": "A wide-angle vehicle headlight to light up the way.", + "looks_like": "car_headlight", + "weight": 2000, + "volume": 5, + "price": 4000, + "copy-from": "car_headlight" + }, + { + "type": "GENERIC", + "id": "headlight_reinforced", + "name": "reinforced headlight", + "description": "A vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.", + "weight": 1200, + "to_hit": -2, + "color": "light_cyan", + "symbol": ",", + "material": [ "steel", "plastic" ], + "bashing": 4, + "price": 40000, + "copy-from": "car_headlight" + }, + { + "type": "GENERIC", + "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, + "volume": 5, + "copy-from": "headlight_reinforced" + }, + { + "type": "GENERIC", + "id": "light_emergency_red", + "name": "emergency vehicle light (red)", + "name_plural": "emergency vehicle lights (red)", + "description": "One of the red-colored lights from the top of an emergency services vehicle. When turned on, the lights rotate to shine in all directions.", + "weight": 500, + "to_hit": 1, + "color": "red", + "material": [ "plastic", "steel" ], + "bashing": 1, + "price": 40000, + "copy-from": "car_headlight" + }, + { + "type": "GENERIC", + "id": "light_emergency_blue", + "name": "emergency vehicle light (blue)", + "name_plural": "emergency vehicle lights (blue)", + "description": "One of the blue-colored lights from the top of an emergency services vehicle. When turned on, the lights rotate to shine in all directions.", + "color": "blue", + "copy-from": "light_emergency_red" + }, + { + "type": "GENERIC", + "id": "floodlight", + "name": "floodlight", + "description": "A large and heavy light designed to illuminate wide areas.", + "weight": 2500, + "to_hit": 1, + "material": [ "plastic", "steel" ], + "volume": 8, + "bashing": 5, + "price": 90000, + "copy-from": "car_headlight" + }, + { + "type": "GENERIC", + "id": "directed_floodlight", + "name": "directed floodlight", + "description": "A large and heavy light designed to illuminate a wide area in a half-circular cone.", + "copy-from": "floodlight" + } +] diff --git a/data/json/items/vehicle/manual.json b/data/json/items/vehicle/manual.json new file mode 100644 index 0000000000000..271a99fc5d7c0 --- /dev/null +++ b/data/json/items/vehicle/manual.json @@ -0,0 +1,28 @@ +[ + { + "type": "GENERIC", + "id": "hand_rims", + "name": "set of hand rims", + "name_plural": "sets of hand rims", + "description": "Hand rims for use on a wheelchair.", + "weight": 816, + "to_hit": -1, + "color": "light_gray", + "symbol": ":", + "material": [ "steel" ], + "volume": 2, + "bashing": 10, + "category": "veh_parts", + "price": 9000 + }, + { + "type": "GENERIC", + "id": "foot_crank", + "copy-from": "hand_rims", + "name": "foot crank", + "description": "The pedal and gear assembly from a bicycle.", + "to_hit": -2, + "bashing": 8, + "cutting": 2 + } +] diff --git a/data/json/items/vehicle/mills.json b/data/json/items/vehicle/mills.json new file mode 100644 index 0000000000000..b42bde86b5579 --- /dev/null +++ b/data/json/items/vehicle/mills.json @@ -0,0 +1,54 @@ +[ + { + "type": "GENERIC", + "id": "wind_turbine", + "name": "wind turbine", + "description": "A small turbine that can convert wind into electric power.", + "weight": 50000, + "to_hit": -4, + "color": "yellow", + "symbol": "T", + "material": [ "steel" ], + "volume": 80, + "bashing": 1, + "category": "veh_parts", + "price": 60000 + }, + { + "type": "GENERIC", + "id": "xl_wind_turbine", + "name": "large wind turbine", + "description": "A large turbine that can convert wind into electric power.", + "weight": 150000, + "to_hit": -7, + "symbol": "Y", + "volume": 240, + "price": 150000, + "copy-from": "wind_turbine" + }, + { + "type": "GENERIC", + "id": "water_wheel", + "name": "water wheel", + "description": "A water wheel. Will slowly recharge the vehicle's electrical power when built over shallow moving water.", + "weight": 300000, + "to_hit": -5, + "symbol": "*", + "material": [ "wood" ], + "volume": 120, + "bashing": 3, + "price": 120000, + "copy-from": "wind_turbine" + }, + { + "type": "GENERIC", + "id": "xl_water_wheel", + "name": "large water wheel", + "description": "A large water wheel with wooden supports. Will recharge the vehicle's electrical power when built over shallow moving water.", + "weight": 600000, + "symbol": "o", + "volume": 240, + "price": 200000, + "copy-from": "water_wheel" + } +] diff --git a/data/json/items/vehicle/motors.json b/data/json/items/vehicle/motors.json new file mode 100644 index 0000000000000..0c978c83b0928 --- /dev/null +++ b/data/json/items/vehicle/motors.json @@ -0,0 +1,74 @@ +[ + { + "type": "GENERIC", + "id": "motor", + "name": "electric motor", + "description": "A powerful electric motor. Useful for crafting.", + "weight": 27200, + "color": "light_cyan", + "symbol": ",", + "material": [ "steel" ], + "volume": "9700 ml", + "bashing": 4, + "category": "veh_parts", + "price": 12000 + }, + { + "type": "GENERIC", + "id": "motor_enhanced", + "name": "enhanced electric motor", + "description": "A very powerful and yet lightweight electric motor. Useful for crafting.", + "weight": 81600, + "material": [ "superalloy" ], + "volume": "2650 ml", + "price": 68000, + "copy-from": "motor" + }, + { + "type": "GENERIC", + "id": "motor_super", + "name": "super electric motor", + "description": "The most powerfull electric motor on the market. Useful for crafting.", + "weight": 133800, + "volume": "111 L", + "price": 80000, + "copy-from": "motor" + }, + { + "type": "GENERIC", + "id": "motor_large", + "name": "large electric motor", + "description": "A large and very powerful electric motor. Useful for crafting.", + "weight": 68000, + "to_hit": -3, + "symbol": ":", + "volume": "1740 ml", + "bashing": 9, + "price": 22000, + "copy-from": "motor" + }, + { + "type": "GENERIC", + "id": "motor_small", + "name": "small electric motor", + "description": "A small electric motor. Useful for crafting.", + "weight": 7500, + "volume": "5 L", + "bashing": 1, + "price": 2000, + "copy-from": "motor" + }, + { + "type": "GENERIC", + "id": "motor_tiny", + "name": "tiny electric motor", + "description": "A tiny electric motor. Useful for crafting.", + "weight": 5800, + "color": "light_cyan", + "symbol": ",", + "material": [ "steel", "plastic" ], + "volume": "500 ml", + "category": "veh_parts", + "price": 2000 + } +] diff --git a/data/json/items/vehicle/noise.json b/data/json/items/vehicle/noise.json new file mode 100644 index 0000000000000..f0e5d58e04415 --- /dev/null +++ b/data/json/items/vehicle/noise.json @@ -0,0 +1,63 @@ +[ + { + "type": "GENERIC", + "id": "muffler", + "name": "muffler", + "description": "A muffler from a car. Very unwieldy as a weapon. Useful in a few crafting recipes.", + "weight": 9525, + "to_hit": -10, + "color": "light_gray", + "symbol": "/", + "material": [ "steel" ], + "techniques": [ "WBLOCK_1" ], + "volume": 14, + "bashing": 19, + "category": "veh_parts", + "price": 3000, + "qualities": [ [ "HAMMER", 1 ] ] + }, + { + "type": "GENERIC", + "id": "beeper", + "name": "back-up beeper", + "description": "This is a safety device intended to warn passersby of a vehicle moving in reverse, but the usage of it now seems terribly unwise.", + "weight": 360, + "symbol": ";", + "color": "light_gray", + "material": [ "plastic", "aluminum" ], + "volume": 1, + "to_hit": -1, + "bashing": 2, + "category": "veh_parts", + "price": 6000 + }, + { + "type": "GENERIC", + "id": "stereo", + "name": "stereo system", + "description": "A stereo system with speakers. It is capable of being hooked up to a vehicle.", + "weight": 800, + "to_hit": -2, + "color": "red", + "symbol": "&", + "material": [ "steel" ], + "volume": 14, + "category": "veh_parts", + "price": 800 + }, + { + "type": "GENERIC", + "id": "chimes", + "name": "chime loudspeakers", + "name_plural": "chime loudspeakers", + "description": "A stereo system with loudspeakers and a built-in set of simple melodies that it will play. Commonly used by ice cream trucks to draw the attention of children in the days when children wanted ice cream more than brains.", + "weight": 2600, + "to_hit": -2, + "color": "blue", + "symbol": "&", + "material": [ "steel" ], + "volume": 16, + "category": "veh_parts", + "price": 5000 + } +] diff --git a/data/json/items/vehicle/plating.json b/data/json/items/vehicle/plating.json new file mode 100644 index 0000000000000..4fd2b8075c3ab --- /dev/null +++ b/data/json/items/vehicle/plating.json @@ -0,0 +1,185 @@ +[ + { + "type": "GENERIC", + "id": "sheet_metal", + "name": "sheet metal", + "description": "A thin sheet of metal.", + "//": "Roughly in the 70cm×70cm×1.5mm to 1m×1m×0.75mm range. Has to be folded / rolled up when in inventory, so 75% density compared to solid block.", + "weight": 6000, + "to_hit": -2, + "color": "light_cyan", + "symbol": "]", + "material": [ "steel" ], + "volume": 4, + "bashing": 5, + "category": "spare_parts", + "price": 6000, + "qualities": [ [ "COOK", 1 ] ] + }, + { + "type": "GENERIC", + "id": "sheet_metal_lit", + "name": "wired sheet metal", + "description": "Sheet metal that has had light housing wired into it.", + "weight": 6200, + "to_hit": -2, + "color": "light_cyan", + "symbol": "]", + "material": [ "steel", "plastic" ], + "volume": 5, + "bashing": 5, + "category": "veh_parts", + "price": 7500 + }, + { + "type": "GENERIC", + "id": "wood_plate", + "name": "wooden armor kit", + "description": "A bundle of two by fours prepared to be used as vehicle armor.", + "weight": 5600, + "to_hit": -8, + "color": "brown", + "symbol": "]", + "material": [ "wood" ], + "volume": 12, + "bashing": 10, + "category": "veh_parts", + "price": 12000 + }, + { + "type": "GENERIC", + "id": "steel_plate", + "name": "steel plating", + "description": "A piece of armor plating made of steel.", + "weight": 12880, + "to_hit": -1, + "color": "light_cyan", + "symbol": "]", + "material": [ "steel" ], + "volume": 12, + "bashing": 6, + "category": "veh_parts", + "price": 12000, + "qualities": [ [ "COOK", 1 ] ] + }, + { + "type": "GENERIC", + "id": "alloy_plate", + "name": "superalloy plating", + "description": "A piece of armor plating made of sturdy superalloy.", + "weight": 10800, + "to_hit": -1, + "color": "light_cyan", + "symbol": "]", + "material": [ "superalloy" ], + "volume": 12, + "bashing": 6, + "category": "veh_parts", + "price": 18500, + "qualities": [ [ "COOK", 1 ] ] + }, + { + "type": "GENERIC", + "id": "alloy_sheet", + "name": "superalloy sheet", + "description": "A sheet of sturdy superalloy, incredibly hard, yet incredibly malleable.", + "weight": 900, + "to_hit": -2, + "color": "light_cyan", + "symbol": ",", + "material": [ "superalloy" ], + "volume": 2, + "category": "veh_parts", + "price": 8500, + "qualities": [ [ "COOK", 1 ] ] + }, + { + "type": "GENERIC", + "id": "spiked_plate", + "name": "spiked plating", + "description": "A piece of armor plating made of steel. It is covered with menacing spikes.", + "weight": 12240, + "to_hit": -1, + "color": "light_cyan", + "symbol": "]", + "material": [ "steel" ], + "volume": 14, + "bashing": 6, + "cutting": 3, + "flags": [ "STAB" ], + "category": "veh_parts", + "price": 18500, + "qualities": [ [ "COOK", 1 ] ] + }, + { + "type": "GENERIC", + "id": "hard_plate", + "name": "hard plating", + "description": "A piece of very thick armor plating made of steel.", + "weight": 32640, + "to_hit": -1, + "color": "light_cyan", + "symbol": "]", + "material": [ "hardsteel" ], + "volume": 12, + "bashing": 6, + "category": "veh_parts", + "price": 16000, + "qualities": [ [ "COOK", 1 ], [ "ANVIL", 1 ] ] + }, + { + "type": "GENERIC", + "id": "mil_plate", + "name": "military composite plating", + "description": "A thick sheet of military grade armor, best bullet stopper you can stick on a vehicle.", + "weight": 16500, + "to_hit": -1, + "color": "green", + "symbol": "]", + "material": [ "hardsteel", "ceramic" ], + "volume": 12, + "bashing": 8, + "category": "veh_parts", + "price": 16000, + "qualities": [ [ "COOK", 1 ] ] + }, + { + "type": "GENERIC", + "id": "chitin_plate", + "symbol": "]", + "color": "yellow", + "name": "chitin armor kit", + "description": "Light chitin plating made for a vehicle.", + "price": 1200, + "material": [ "chitin" ], + "weight": 2000, + "volume": 22, + "bashing": 8, + "to_hit": -4, + "category": "veh_parts" + }, + { + "type": "GENERIC", + "id": "acidchitin_plate", + "copy-from": "chitin_plate", + "name": "biosilicified chitin armor kit", + "description": "Durable silica-coated chitin plating made for a vehicle.", + "material": [ "acidchitin" ], + "proportional": { "price": 1.333, "weight": 1.2, "volume": 1.18, "bashing": 1.25 } + }, + { + "type": "GENERIC", + "id": "bone_plate", + "symbol": "]", + "color": "white", + "name": "bone armor kit", + "description": "Bone plating made for a vehicle.", + "price": 1200, + "material": [ "bone" ], + "weight": 4000, + "volume": 38, + "bashing": 8, + "to_hit": -4, + "category": "veh_parts" + } +] diff --git a/data/json/items/vehicle/seating.json b/data/json/items/vehicle/seating.json new file mode 100644 index 0000000000000..5f394cad3c16c --- /dev/null +++ b/data/json/items/vehicle/seating.json @@ -0,0 +1,29 @@ +[ + { + "type": "GENERIC", + "id": "seat", + "name": "seat", + "description": "A soft car seat covered with leather.", + "weight": 9071, + "to_hit": -4, + "color": "red", + "symbol": "0", + "material": [ "leather", "aluminum" ], + "volume": 30, + "bashing": 4, + "category": "veh_parts", + "price": 25000 + }, + { + "type": "GENERIC", + "id": "saddle", + "name": "saddle", + "description": "A leather-covered seat designed to be straddled.", + "weight": 300, + "material": [ "plastic", "aluminum" ], + "volume": 5, + "bashing": 2, + "price": 2500, + "copy-from": "seat" + } +] diff --git a/data/json/items/vehicle/solar.json b/data/json/items/vehicle/solar.json new file mode 100644 index 0000000000000..2da28cb3fdfe6 --- /dev/null +++ b/data/json/items/vehicle/solar.json @@ -0,0 +1,73 @@ +[ + { + "type": "GENERIC", + "id": "solar_panel", + "name": "solar panel", + "description": "Electronic device that can convert solar radiation into electric power. Useful for a vehicle.", + "weight": 14000, + "to_hit": -4, + "color": "yellow", + "symbol": "]", + "material": [ "glass" ], + "volume": 12, + "bashing": 1, + "category": "veh_parts", + "price": 90000 + }, + { + "type": "GENERIC", + "id": "reinforced_solar_panel", + "name": "reinforced solar panel", + "description": "A solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal panel. Useful for a vehicle.", + "weight": 24153, + "color": "light_blue", + "material": [ "glass", "steel" ], + "volume": 26, + "price": 120000, + "copy-from": "solar_panel" + }, + { + "type": "GENERIC", + "id": "solar_panel_v2", + "name": "upgraded solar panel", + "description": "Electronic device that can convert solar radiation into electric power. This panel has been upgraded to convert more sunlight into power. Useful for a vehicle.", + "weight": 18494, + "volume": 18, + "price": 190000, + "copy-from": "solar_panel" + }, + { + "type": "GENERIC", + "id": "reinforced_solar_panel_v2", + "name": "upgraded reinforced solar panel", + "description": "An upgraded solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal upgraded panel. Useful for a vehicle.", + "weight": 29062, + "to_hit": -5, + "volume": 30, + "price": 240000, + "copy-from": "reinforced_solar_panel" + }, + { + "type": "GENERIC", + "id": "solar_panel_v3", + "name": "quantum solar panel", + "description": "This solar panel is obviously cutting-edge technology and given where you found it, should probably provide a LOT of power. It's covered in strange-looking material, but the covering looks rather fragile; it doesn't look like it could support a reinforcing sheet, either.", + "to_hit": -5, + "material": [ "glass", "steel" ], + "volume": 18, + "price": 900000, + "copy-from": "solar_panel" + }, + { + "type": "GENERIC", + "id": "solar_cell", + "name": "solar cell", + "description": "A small electronic device that can convert solar radiation into electric power. Useful for crafting.", + "weight": 500, + "symbol": ";", + "volume": 1, + "category": "spare_parts", + "price": 5000, + "copy-from": "solar_panel" + } +] diff --git a/data/json/items/vehicle/tables.json b/data/json/items/vehicle/tables.json new file mode 100644 index 0000000000000..b1f74b05b2c68 --- /dev/null +++ b/data/json/items/vehicle/tables.json @@ -0,0 +1,37 @@ +[ + { + "type": "GENERIC", + "id": "v_table", + "name": "fancy table", + "description": "A very fancy table from a very fancy RV. If times were better it might be useful for something more than firewood.", + "weight": 9071, + "to_hit": -8, + "color": "red", + "symbol": "0", + "material": [ "wood" ], + "flags": "TRADER_AVOID", + "volume": 42, + "bashing": 6, + "category": "veh_parts", + "price": 20000 + }, + { + "type": "GENERIC", + "id": "w_table", + "name": "wooden table", + "description": "A crude wooden table.", + "weight": 10071, + "copy-from": "v_table" + }, + { + "type": "GENERIC", + "id": "workbench", + "name": "workbench", + "description": "A sturdy workbench built out of metal. It is perfect for crafting large and heavy things.", + "weight": 23000, + "material": [ "steel" ], + "bashing": 8, + "price": 40000, + "copy-from": "v_table" + } +] diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json new file mode 100644 index 0000000000000..acf74f1ece94d --- /dev/null +++ b/data/json/items/vehicle/utilities.json @@ -0,0 +1,34 @@ +[ + { + "type": "GENERIC", + "id": "washing_machine", + "name": "washing machine", + "description": "A very small washing machine designed for use in vehicles.", + "weight": 31752, + "to_hit": -8, + "color": "light_blue", + "symbol": "]", + "material": "steel", + "volume": "125 L", + "bashing": 8, + "category": "veh_parts", + "price": 60000 + }, + { + "type": "GENERIC", + "copy-from": "washing_machine", + "id": "minifridge", + "name": "minifridge", + "description": "A very small fridge for keeping food cool. Provides some insulation from outside weather.", + "insulation": 2 + }, + { + "type": "GENERIC", + "id": "minifreezer", + "name": "minifreezer", + "description": "Compact version of a chest freezer, designed as a mobile solution for freezing food. Provides insulation from the elements.", + "price": 70000, + "insulation": 4, + "copy-from": "minifridge" + } +] diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json index ea3df1935781a..e4e4f3481ce30 100644 --- a/data/json/items/vehicle/wheel.json +++ b/data/json/items/vehicle/wheel.json @@ -86,20 +86,10 @@ }, { "id": "wheel_bicycle_or", + "copy-from": "wheel_bicycle", "type": "WHEEL", - "category": "veh_parts", "name": "off-road bicycle wheel", - "description": "A wide, studded, bicycle wheel intended for off-road biking.", - "weight": 1500, - "volume": 28, - "price": 4000, - "bashing": 8, - "to_hit": -1, - "material": [ "steel", "plastic" ], - "symbol": "]", - "color": "dark_gray", - "diameter": 27, - "width": 3 + "description": "A wide, studded, bicycle wheel intended for off-road biking." }, { "id": "wheel_caster", @@ -172,20 +162,10 @@ }, { "id": "wheel_motorbike_or", + "copy-from": "wheel_motorbike", "type": "WHEEL", - "category": "veh_parts", "name": "off-road motorbike wheel", - "description": "A motorbike wheel, studded for improved off-road performance.", - "weight": 5443, - "volume": 33, - "price": 14000, - "bashing": 10, - "to_hit": -1, - "material": [ "steel", "plastic" ], - "symbol": "]", - "color": "dark_gray", - "diameter": 16, - "width": 4 + "description": "A motorbike wheel, studded for improved off-road performance." }, { "id": "hd_steel_drum", @@ -276,20 +256,10 @@ }, { "id": "wheel_wide_or", + "copy-from": "wheel_wide", "type": "WHEEL", - "category": "veh_parts", "name": "off-road wide wheel", - "description": "A wide wheel. \\o/ This wide. It's studded to provide better grip off-road at the cost of some performance on pavement.", - "weight": 22600, - "volume": 70, - "price": 34000, - "bashing": 17, - "to_hit": -1, - "material": [ "steel", "plastic" ], - "symbol": "]", - "color": "dark_gray", - "diameter": 24, - "width": 14 + "description": "A wide wheel. \\o/ This wide. It's studded to provide better grip off-road at the cost of some performance on pavement." }, { "id": "wheel_wood", diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json index 8e0741e96593b..dcd75559cacfa 100644 --- a/data/json/items/vehicle_parts.json +++ b/data/json/items/vehicle_parts.json @@ -1,455 +1,4 @@ [ - { - "type": "GENERIC", - "id": "foldframe", - "name": "foldable-light frame", - "description": "A small foldable lightweight frame made from pipework.", - "weight": 5000, - "to_hit": -3, - "color": "light_gray", - "symbol": "]", - "material": [ "steel" ], - "techniques": [ "DEF_DISARM" ], - "volume": 40, - "bashing": 15, - "category": "veh_parts", - "price": 4000 - }, - { - "type": "GENERIC", - "id": "foldwoodframe", - "name": "foldable wooden frame", - "description": "A small foldable frame made from scrap wood.", - "weight": 4000, - "to_hit": -3, - "color": "brown", - "symbol": "]", - "material": [ "wood" ], - "techniques": [ "DEF_DISARM" ], - "volume": 50, - "bashing": 15, - "category": "veh_parts", - "price": 4000 - }, - { - "type": "GENERIC", - "id": "xlframe", - "name": "extra-light frame", - "description": "A small lightweight frame made from pipework. Useful for crafting.", - "weight": 5000, - "to_hit": -3, - "color": "light_gray", - "symbol": "]", - "material": [ "aluminum" ], - "techniques": [ "DEF_DISARM" ], - "volume": 40, - "bashing": 15, - "category": "veh_parts", - "price": 4000 - }, - { - "type": "GENERIC", - "id": "frame", - "name": "steel frame", - "description": "A large frame made of steel. Useful for crafting.", - "weight": 20000, - "to_hit": -5, - "color": "cyan", - "symbol": "]", - "material": [ "steel" ], - "techniques": [ "DEF_DISARM" ], - "volume": 60, - "bashing": 20, - "category": "veh_parts", - "price": 5500 - }, - { - "type": "GENERIC", - "id": "basket", - "name": "wire basket", - "description": "A large wire basket from a shopping cart.", - "weight": 6000, - "to_hit": -5, - "color": "cyan", - "symbol": "]", - "material": [ "steel" ], - "techniques": [ "DEF_DISARM" ], - "volume": 90, - "bashing": 20, - "category": "veh_parts", - "price": 10000, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "folding_basket", - "name": "folding wire basket", - "description": "A large wire basket from a shopping cart, modified to be foldable.", - "weight": 7000, - "to_hit": -5, - "color": "cyan", - "symbol": "]", - "material": [ "steel" ], - "techniques": [ "DEF_DISARM" ], - "volume": 90, - "bashing": 20, - "category": "veh_parts", - "price": 10000, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "bike_basket", - "name": "bike basket", - "description": "A simple bike basket. It is small and foldable.", - "weight": 1200, - "to_hit": -5, - "color": "cyan", - "symbol": "]", - "material": [ "steel" ], - "techniques": [ "DEF_DISARM" ], - "volume": 20, - "bashing": 20, - "category": "veh_parts", - "price": 3500, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "frame_wood", - "name": "wooden frame", - "description": "A large frame made of wood. Useful for crafting.", - "weight": 8000, - "to_hit": -5, - "color": "brown", - "symbol": "]", - "material": [ "wood" ], - "techniques": [ "DEF_DISARM" ], - "volume": 60, - "bashing": 16, - "cutting": 4, - "category": "veh_parts", - "price": 3500 - }, - { - "type": "GENERIC", - "id": "frame_wood_light", - "name": "light wooden frame", - "description": "A small frame made of few pieces of wood, held together by rope. Useful for crafting.", - "weight": 4000, - "to_hit": -5, - "color": "brown", - "symbol": "]", - "material": [ "wood" ], - "techniques": [ "DEF_DISARM" ], - "volume": 35, - "bashing": 8, - "cutting": 1, - "category": "veh_parts", - "price": 1000 - }, - { - "type": "GENERIC", - "id": "hdframe", - "name": "heavy duty frame", - "description": "A large, reinforced steel frame, used in military vehicle construction.", - "weight": 100000, - "to_hit": -6, - "color": "green", - "symbol": "]", - "material": [ "hardsteel", "steel" ], - "techniques": [ "DEF_DISARM" ], - "volume": 80, - "bashing": 25, - "category": "veh_parts", - "price": 12000, - "qualities": [ [ "ANVIL", 1 ] ] - }, - { - "type": "GENERIC", - "id": "seat", - "name": "seat", - "description": "A soft car seat covered with leather.", - "weight": 9071, - "to_hit": -4, - "color": "red", - "symbol": "0", - "material": [ "leather", "aluminum" ], - "volume": 30, - "bashing": 4, - "category": "veh_parts", - "price": 25000 - }, - { - "type": "GENERIC", - "id": "v_table", - "name": "fancy table", - "description": "A very fancy table from a very fancy RV. If times were better it might be useful for something more than firewood.", - "weight": 9071, - "to_hit": -8, - "color": "red", - "symbol": "0", - "material": [ "wood" ], - "flags": "TRADER_AVOID", - "volume": 42, - "bashing": 6, - "category": "veh_parts", - "price": 20000 - }, - { - "type": "GENERIC", - "id": "w_table", - "name": "wooden table", - "description": "A crude wooden table.", - "weight": 10071, - "to_hit": -8, - "color": "red", - "symbol": "0", - "material": [ "wood" ], - "volume": 42, - "bashing": 6, - "category": "veh_parts", - "price": 20000 - }, - { - "type": "GENERIC", - "id": "workbench", - "name": "workbench", - "description": "A sturdy workbench built out of metal. It is perfect for crafting large and heavy things.", - "weight": 23000, - "to_hit": -8, - "color": "red", - "symbol": "0", - "material": [ "steel" ], - "volume": 42, - "bashing": 8, - "category": "veh_parts", - "price": 40000 - }, - { - "type": "GENERIC", - "id": "saddle", - "name": "saddle", - "description": "A leather-covered seat designed to be straddled.", - "weight": 300, - "to_hit": -4, - "color": "red", - "symbol": "0", - "material": [ "plastic", "aluminum" ], - "volume": 5, - "bashing": 2, - "category": "veh_parts", - "price": 2500 - }, - { - "type": "GENERIC", - "id": "muffler", - "name": "muffler", - "description": "A muffler from a car. Very unwieldy as a weapon. Useful in a few crafting recipes.", - "weight": 9525, - "to_hit": -10, - "color": "light_gray", - "symbol": "/", - "material": [ "steel" ], - "techniques": [ "WBLOCK_1" ], - "volume": 14, - "bashing": 19, - "category": "veh_parts", - "price": 3000, - "qualities": [ [ "HAMMER", 1 ] ] - }, - { - "type": "GENERIC", - "id": "vehicle_controls", - "name": "vehicle controls", - "name_plural": "sets of vehicle controls", - "description": "A set of various vehicle controls. Useful for crafting.", - "weight": 6000, - "to_hit": -4, - "color": "light_cyan", - "symbol": "$", - "material": [ "plastic", "steel" ], - "volume": 12, - "bashing": 2, - "category": "veh_parts", - "price": 40000 - }, - { - "type": "GENERIC", - "id": "vehicle_dashboard", - "name": "dashboard", - "description": "A vehicle instrument panel with various gauges and switches. Useful for crafting.", - "weight": 2721, - "to_hit": -2, - "color": "cyan", - "symbol": "$", - "material": [ "plastic", "steel" ], - "volume": 40, - "bashing": 1, - "category": "veh_parts", - "price": 8000 - }, - { - "type": "GENERIC", - "id": "electronics_controls", - "name": "electronics control unit", - "description": "A vehicle instrument panel with various gauges and switches. Useful for crafting.", - "weight": 1311, - "to_hit": -4, - "color": "cyan", - "symbol": "$", - "material": [ "plastic" ], - "volume": 6, - "bashing": 1, - "category": "veh_parts", - "price": 4000 - }, - { - "type": "GENERIC", - "id": "motor", - "name": "electric motor", - "description": "A powerful electric motor. Useful for crafting.", - "weight": 27200, - "color": "light_cyan", - "symbol": ",", - "material": [ "steel" ], - "volume": "9700 ml", - "bashing": 4, - "category": "veh_parts", - "price": 12000 - }, - { - "type": "GENERIC", - "id": "motor_enhanced", - "name": "enhanced electric motor", - "description": "A very powerful and yet lightweight electric motor. Useful for crafting.", - "weight": 81600, - "color": "light_cyan", - "symbol": ",", - "material": [ "superalloy" ], - "volume": "2650 ml", - "bashing": 4, - "category": "veh_parts", - "price": 68000 - }, - { - "type": "GENERIC", - "id": "motor_super", - "name": "super electric motor", - "description": "The most powerfull electric motor on the market. Useful for crafting.", - "weight": 133800, - "color": "light_cyan", - "symbol": ",", - "material": [ "steel" ], - "volume": "111 L", - "bashing": 4, - "category": "veh_parts", - "price": 80000 - }, - { - "type": "GENERIC", - "id": "motor_large", - "name": "large electric motor", - "description": "A large and very powerful electric motor. Useful for crafting.", - "weight": 68000, - "to_hit": -3, - "color": "light_cyan", - "symbol": ":", - "material": [ "steel" ], - "volume": "1740 ml", - "bashing": 9, - "category": "veh_parts", - "price": 22000 - }, - { - "type": "GENERIC", - "id": "motor_small", - "name": "small electric motor", - "description": "A small electric motor. Useful for crafting.", - "weight": 7500, - "color": "light_cyan", - "symbol": ",", - "material": [ "steel" ], - "volume": "5 L", - "bashing": 1, - "category": "veh_parts", - "price": 2000 - }, - { - "type": "GENERIC", - "id": "motor_tiny", - "name": "tiny electric motor", - "description": "A tiny electric motor. Useful for crafting.", - "weight": 5800, - "color": "light_cyan", - "symbol": ",", - "material": [ "steel", "plastic" ], - "volume": "500 ml", - "category": "veh_parts", - "price": 2000 - }, - { - "type": "GENERIC", - "id": "foot_crank", - "name": "foot crank", - "description": "The pedal and gear assembly from a bicycle.", - "weight": 816, - "to_hit": -2, - "color": "light_gray", - "symbol": ":", - "material": [ "steel" ], - "volume": 2, - "bashing": 8, - "cutting": 2, - "category": "veh_parts", - "price": 9000 - }, - { - "type": "GENERIC", - "id": "hand_rims", - "name": "set of hand rims", - "name_plural": "sets of hand rims", - "description": "Hand rims for use on a wheelchair.", - "weight": 816, - "to_hit": -1, - "color": "light_gray", - "symbol": ":", - "material": [ "steel" ], - "volume": 2, - "bashing": 10, - "category": "veh_parts", - "price": 9000 - }, - { - "type": "GENERIC", - "id": "headlight_reinforced", - "name": "reinforced headlight", - "description": "A vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.", - "weight": 1200, - "to_hit": -2, - "color": "light_cyan", - "symbol": ",", - "material": [ "steel", "plastic" ], - "volume": 4, - "bashing": 4, - "category": "veh_parts", - "price": 40000 - }, - { - "type": "GENERIC", - "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, - "to_hit": -2, - "color": "light_cyan", - "symbol": ",", - "material": [ "steel", "plastic" ], - "volume": 5, - "bashing": 4, - "category": "veh_parts", - "price": 40000 - }, { "type": "GENERIC", "id": "it_battery_mount", @@ -467,379 +16,37 @@ "price": 1000 }, { - "type": "TOOL", - "id": "black_box", - "category": "other", - "name": "military black box", - "name_plural": "military black boxes", - "description": "This is a black box, seemingly pulled from some sort of military vehicle wreckage. If you can find a system to analyze this you may find something of interest.", - "weight": 4535, - "volume": "2 L", - "price": 0, - "to_hit": -1, - "bashing": 4, - "material": [ "steel" ], - "symbol": ";", - "color": "light_gray" - }, - { - "type": "TOOL", - "id": "minireactor", - "name": "minireactor", - "description": "A small portable plutonium reactor. Handle with great care!", - "weight": 27215, - "to_hit": -4, - "color": "light_cyan", - "symbol": ":", - "material": [ "superalloy", "ceramic" ], - "volume": "100 L", - "bashing": 7, - "category": "veh_parts", - "price": 90000, - "ammo": "plutonium", - "max_charges": 10000 - }, - { - "type": "GENERIC", - "id": "solar_panel", - "name": "solar panel", - "description": "Electronic device that can convert solar radiation into electric power. Useful for a vehicle.", - "weight": 14000, - "to_hit": -4, - "color": "yellow", - "symbol": "]", - "material": [ "glass" ], - "volume": 12, - "bashing": 1, - "category": "veh_parts", - "price": 90000 - }, - { - "type": "GENERIC", - "id": "wind_turbine", - "name": "wind turbine", - "description": "A small turbine that can convert wind into electric power.", - "weight": 50000, - "to_hit": -4, - "color": "yellow", - "symbol": "T", - "material": [ "steel" ], - "volume": 80, - "bashing": 1, - "category": "veh_parts", - "price": 60000 - }, - { - "type": "GENERIC", - "id": "xl_wind_turbine", - "name": "large wind turbine", - "looks_like": "wind_turbine", - "description": "A large turbine that can convert wind into electric power.", - "weight": 150000, - "to_hit": -7, - "color": "yellow", - "symbol": "Y", - "material": [ "steel" ], - "volume": 240, - "bashing": 1, - "category": "veh_parts", - "price": 150000 - }, - { - "type": "GENERIC", - "id": "water_wheel", - "name": "water wheel", - "description": "A water wheel. Will slowly recharge the vehicle's electrical power when built over shallow moving water.", - "weight": 300000, - "to_hit": -5, - "color": "yellow", - "symbol": "*", - "material": [ "wood" ], - "volume": 120, - "bashing": 3, - "category": "veh_parts", - "price": 120000 - }, - { - "type": "GENERIC", - "id": "xl_water_wheel", - "name": "large water wheel", - "description": "A large water wheel with wooden supports. Will recharge the vehicle's electrical power when built over shallow moving water.", - "weight": 600000, - "to_hit": -5, - "color": "yellow", - "symbol": "o", - "material": [ "wood" ], - "volume": 240, - "bashing": 3, - "category": "veh_parts", - "price": 200000 - }, - { - "type": "GENERIC", - "id": "reinforced_solar_panel", - "name": "reinforced solar panel", - "description": "A solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal panel. Useful for a vehicle.", - "weight": 24153, - "to_hit": -4, - "color": "light_blue", - "symbol": "]", - "material": [ "glass", "steel" ], - "volume": 26, - "bashing": 1, - "category": "veh_parts", - "price": 120000 - }, - { - "type": "GENERIC", - "id": "solar_panel_v2", - "name": "upgraded solar panel", - "description": "Electronic device that can convert solar radiation into electric power. This panel has been upgraded to convert more sunlight into power. Useful for a vehicle.", - "weight": 18494, - "to_hit": -4, - "color": "yellow", - "symbol": "]", - "material": [ "glass" ], - "volume": 18, - "bashing": 1, - "category": "veh_parts", - "price": 900 - }, - { - "type": "GENERIC", - "id": "reinforced_solar_panel_v2", - "name": "upgraded reinforced solar panel", - "description": "An upgraded solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal upgraded panel. Useful for a vehicle.", - "weight": 29062, - "to_hit": -5, - "color": "light_blue", - "symbol": "]", - "material": [ "glass", "steel" ], - "volume": 30, - "bashing": 1, - "category": "veh_parts", - "price": 900 - }, - { - "type": "GENERIC", - "id": "solar_panel_v3", - "name": "quantum solar panel", - "description": "This solar panel is obviously cutting-edge technology and given where you found it, should probably provide a LOT of power. It's covered in strange-looking material, but the covering looks rather fragile; it doesn't look like it could support a reinforcing sheet, either.", - "weight": 14000, - "to_hit": -5, - "color": "yellow", - "symbol": "]", - "material": [ "glass", "steel" ], - "volume": 18, - "bashing": 1, - "category": "veh_parts", - "price": 9000 - }, - { - "type": "GENERIC", - "id": "minifridge", - "name": "minifridge", - "description": "A very small fridge for keeping food cool. Provides some insulation from outside weather.", - "weight": 31752, - "to_hit": -8, - "color": "light_blue", - "symbol": "]", - "material": "steel", - "volume": "125 L", - "bashing": 8, - "category": "veh_parts", - "price": 60000, - "insulation": 2 - }, - { - "type": "GENERIC", - "id": "minifreezer", - "name": "minifreezer", - "description": "Compact version of a chest freezer, designed as a mobile solution for freezing food. Provides insulation from the elements.", - "weight": 31752, - "to_hit": -8, - "color": "light_blue", - "symbol": "]", - "material": "steel", - "volume": "125 L", - "bashing": 8, - "category": "veh_parts", - "price": 70000, - "insulation": 4 - }, - { - "type": "GENERIC", - "id": "washing_machine", - "name": "washing machine", - "description": "A very small washing machine designed for use in vehicles.", - "weight": 31752, - "to_hit": -8, - "color": "light_blue", - "symbol": "]", - "material": "steel", - "volume": "125 L", - "bashing": 8, - "category": "veh_parts", - "price": 60000 - }, - { - "type": "GENERIC", - "id": "solar_cell", - "name": "solar cell", - "description": "A small electronic device that can convert solar radiation into electric power. Useful for crafting.", - "weight": 500, - "to_hit": -4, - "color": "yellow", - "symbol": ";", - "material": [ "glass" ], - "volume": 1, - "bashing": 1, - "category": "spare_parts", - "price": 5000 - }, - { - "type": "GENERIC", - "id": "sheet_metal", - "name": "sheet metal", - "description": "A thin sheet of metal.", - "//": "Roughly in the 70cm×70cm×1.5mm to 1m×1m×0.75mm range. Has to be folded / rolled up when in inventory, so 75% density compared to solid block.", - "weight": 6000, - "to_hit": -2, - "color": "light_cyan", - "symbol": "]", - "material": [ "steel" ], - "volume": 4, - "bashing": 5, - "category": "spare_parts", - "price": 6000, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "sheet_metal_lit", - "name": "wired sheet metal", - "description": "Sheet metal that has had light housing wired into it.", - "weight": 6200, - "to_hit": -2, - "color": "light_cyan", - "symbol": "]", - "material": [ "steel", "plastic" ], - "volume": 5, - "bashing": 5, - "category": "veh_parts", - "price": 7500 - }, - { - "type": "GENERIC", - "id": "wood_plate", - "name": "wooden armor kit", - "description": "A bundle of two by fours prepared to be used as vehicle armor.", - "weight": 5600, - "to_hit": -8, - "color": "brown", - "symbol": "]", - "material": [ "wood" ], - "volume": 12, - "bashing": 10, - "category": "veh_parts", - "price": 12000 - }, - { - "type": "GENERIC", - "id": "steel_plate", - "name": "steel plating", - "description": "A piece of armor plating made of steel.", - "weight": 12880, - "to_hit": -1, - "color": "light_cyan", - "symbol": "]", - "material": [ "steel" ], - "volume": 12, - "bashing": 6, - "category": "veh_parts", - "price": 12000, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "alloy_plate", - "name": "superalloy plating", - "description": "A piece of armor plating made of sturdy superalloy.", - "weight": 10800, - "to_hit": -1, - "color": "light_cyan", - "symbol": "]", - "material": [ "superalloy" ], - "volume": 12, - "bashing": 6, - "category": "veh_parts", - "price": 18500, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "alloy_sheet", - "name": "superalloy sheet", - "description": "A sheet of sturdy superalloy, incredibly hard, yet incredibly malleable.", - "weight": 900, - "to_hit": -2, - "color": "light_cyan", - "symbol": ",", - "material": [ "superalloy" ], - "volume": 2, - "category": "veh_parts", - "price": 8500, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "spiked_plate", - "name": "spiked plating", - "description": "A piece of armor plating made of steel. It is covered with menacing spikes.", - "weight": 12240, - "to_hit": -1, - "color": "light_cyan", - "symbol": "]", - "material": [ "steel" ], - "volume": 14, - "bashing": 6, - "cutting": 3, - "flags": [ "STAB" ], - "category": "veh_parts", - "price": 18500, - "qualities": [ [ "COOK", 1 ] ] - }, - { - "type": "GENERIC", - "id": "hard_plate", - "name": "hard plating", - "description": "A piece of very thick armor plating made of steel.", - "weight": 32640, + "type": "TOOL", + "id": "black_box", + "category": "other", + "name": "military black box", + "name_plural": "military black boxes", + "description": "This is a black box, seemingly pulled from some sort of military vehicle wreckage. If you can find a system to analyze this you may find something of interest.", + "weight": 4535, + "volume": "2 L", + "price": 0, "to_hit": -1, - "color": "light_cyan", - "symbol": "]", - "material": [ "hardsteel" ], - "volume": 12, - "bashing": 6, - "category": "veh_parts", - "price": 16000, - "qualities": [ [ "COOK", 1 ], [ "ANVIL", 1 ] ] + "bashing": 4, + "material": [ "steel" ], + "symbol": ";", + "color": "light_gray" }, { - "type": "GENERIC", - "id": "mil_plate", - "name": "military composite plating", - "description": "A thick sheet of military grade armor, best bullet stopper you can stick on a vehicle.", - "weight": 16500, - "to_hit": -1, - "color": "green", - "symbol": "]", - "material": [ "hardsteel", "ceramic" ], - "volume": 12, - "bashing": 8, + "type": "TOOL", + "id": "minireactor", + "name": "minireactor", + "description": "A small portable plutonium reactor. Handle with great care!", + "weight": 27215, + "to_hit": -4, + "color": "light_cyan", + "symbol": ":", + "material": [ "superalloy", "ceramic" ], + "volume": "100 L", + "bashing": 7, "category": "veh_parts", - "price": 16000, - "qualities": [ [ "COOK", 1 ] ] + "price": 90000, + "ammo": "plutonium", + "max_charges": 10000 }, { "type": "GENERIC", @@ -870,115 +77,6 @@ "category": "veh_parts", "price": 80000 }, - { - "type": "GENERIC", - "id": "beeper", - "name": "back-up beeper", - "description": "This is a safety device intended to warn passersby of a vehicle moving in reverse, but the usage of it now seems terribly unwise.", - "weight": 360, - "symbol": ";", - "color": "light_gray", - "material": [ "plastic", "aluminum" ], - "volume": 1, - "to_hit": -1, - "bashing": 2, - "category": "veh_parts", - "price": 6000 - }, - { - "type": "GENERIC", - "id": "light_emergency_red", - "name": "emergency vehicle light (red)", - "name_plural": "emergency vehicle lights (red)", - "description": "One of the red-colored lights from the top of an emergency services vehicle. When turned on, the lights rotate to shine in all directions.", - "weight": 500, - "to_hit": 1, - "color": "red", - "symbol": ";", - "material": [ "plastic", "steel" ], - "volume": 4, - "bashing": 1, - "category": "veh_parts", - "price": 40000 - }, - { - "type": "GENERIC", - "id": "light_emergency_blue", - "name": "emergency vehicle light (blue)", - "name_plural": "emergency vehicle lights (blue)", - "description": "One of the blue-colored lights from the top of an emergency services vehicle. When turned on, the lights rotate to shine in all directions.", - "weight": 500, - "to_hit": 1, - "color": "blue", - "symbol": ";", - "material": [ "plastic", "steel" ], - "volume": 4, - "bashing": 1, - "category": "veh_parts", - "price": 40000 - }, - { - "type": "GENERIC", - "id": "cargo_rack", - "name": "cargo carrier", - "description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo.", - "weight": 80000, - "to_hit": -4, - "color": "cyan", - "symbol": "]", - "material": [ "steel", "plastic" ], - "volume": 200, - "bashing": 2, - "category": "veh_parts", - "price": 40000 - }, - { - "id": "cargo_aisle", - "type": "GENERIC", - "name": "floor trunk", - "description": "A section of flooring with a cargo-space beneath, and a hinged door for access.", - "weight": 18000, - "color": "cyan", - "symbol": "]", - "volume": 200, - "bashing": 2, - "material": [ "steel", "plastic" ], - "category": "veh_parts", - "price": 20000 - }, - { - "id": "livestock_carrier", - "type": "GENERIC", - "name": "livestock carrier", - "description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo, with additional railings to keep a large animal in place. It is meant to hold large animals for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", - "weight": 96000, - "volume": 250, - "price": 48000, - "category": "veh_parts", - "material": [ "steel", "plastic" ], - "symbol": "]", - "color": "light_gray", - "looks_like": "cargo_rack", - "properties": [ [ "monster_size_capacity", "HUGE" ] ], - "use_action": "CAPTURE_MONSTER_VEH", - "flags": [ "TRADER_AVOID", "USE_PART_ITEM" ] - }, - { - "id": "animal_locker", - "type": "GENERIC", - "name": "animal locker", - "description": "A locker used to contain animals safely during transportation if installed properly. There is room for animal food and other animal care goods. It is meant to hold medium or smaller animals for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", - "weight": 10000, - "volume": 125, - "price": 16000, - "category": "veh_parts", - "material": [ "steel", "plastic" ], - "symbol": "]", - "color": "light_gray", - "properties": [ [ "monster_size_capacity", "MEDIUM" ] ], - "use_action": "CAPTURE_MONSTER_VEH", - "flags": [ "TRADER_AVOID", "USE_PART_ITEM" ] - }, { "id": "bike_rack", "type": "GENERIC", @@ -994,37 +92,6 @@ "looks_like": "foldframe", "flags": [ "TRADER_AVOID" ] }, - { - "type": "GENERIC", - "id": "floodlight", - "name": "floodlight", - "description": "A large and heavy light designed to illuminate wide areas.", - "weight": 2500, - "to_hit": 1, - "color": "white", - "symbol": ";", - "material": [ "plastic", "steel" ], - "volume": 8, - "bashing": 5, - "category": "veh_parts", - "price": 90000 - }, - { - "type": "GENERIC", - "id": "directed_floodlight", - "name": "directed floodlight", - "description": "A large and heavy light designed to illuminate a wide area in a half-circular cone.", - "weight": 2500, - "to_hit": 1, - "color": "white", - "symbol": ";", - "material": [ "plastic", "steel" ], - "volume": 8, - "bashing": 5, - "category": "veh_parts", - "price": 90000, - "looks_like": "floodlight" - }, { "type": "GENERIC", "id": "recharge_station", @@ -1040,147 +107,6 @@ "category": "veh_parts", "price": 90000 }, - { - "type": "GENERIC", - "id": "stereo", - "name": "stereo system", - "description": "A stereo system with speakers. It is capable of being hooked up to a vehicle.", - "weight": 800, - "to_hit": -2, - "color": "red", - "symbol": "&", - "material": [ "steel" ], - "volume": 14, - "category": "veh_parts", - "price": 800 - }, - { - "type": "GENERIC", - "id": "chimes", - "name": "chime loudspeakers", - "name_plural": "chime loudspeakers", - "description": "A stereo system with loudspeakers and a built-in set of simple melodies that it will play. Commonly used by ice cream trucks to draw the attention of children in the days when children wanted ice cream more than brains.", - "weight": 2600, - "to_hit": -2, - "color": "blue", - "symbol": "&", - "material": [ "steel" ], - "volume": 16, - "category": "veh_parts", - "price": 5000 - }, - { - "type": "TOOL", - "id": "jumper_cable", - "name": "jumper cable", - "description": "A jumper cable, like you've seen many times before: it's a short multi-stranded copper cable with power leads on either end, whose purpose is to share power between vehicles.", - "to_hit": 1, - "color": "light_blue", - "symbol": "&", - "material": [ "steel", "plastic" ], - "volume": 2, - "weight": 75, - "bashing": 2, - "category": "tools", - "price": 1, - "max_charges": 3, - "initial_charges": 3, - "use_action": "CABLE_ATTACH", - "flags": [ "CABLE_SPOOL" ] - }, - { - "type": "TOOL", - "id": "jumper_cable_heavy", - "name": "heavy-duty cable", - "description": "A long, thick, heavy-duty cable with power leads on either end. It looks like you could use it to hook up two vehicles to each other, though you expect the power loss would be noticeable.", - "to_hit": 1, - "color": "light_blue", - "symbol": "&", - "material": [ "steel", "plastic" ], - "volume": 6, - "weight": 750, - "bashing": 2, - "category": "tools", - "price": 1, - "max_charges": 20, - "initial_charges": 20, - "use_action": "CABLE_ATTACH", - "flags": [ "CABLE_SPOOL" ] - }, - { - "type": "TOOL", - "id": "jumper_cable_debug", - "name": "shiny cable", - "description": "This is the cable of the gods: 50 meters long, no power loss, light as a feather and fits in a matchbook. You're sure this wasn't supposed to exist, and the way it shimmers makes you uneasy.", - "weight": 1, - "to_hit": 1, - "color": "light_blue", - "symbol": "&", - "material": [ "steel", "plastic" ], - "volume": 0, - "bashing": 2, - "category": "tools", - "price": 1, - "max_charges": 50, - "initial_charges": 50, - "use_action": "CABLE_ATTACH", - "flags": [ "CABLE_SPOOL" ] - }, - { - "type": "GENERIC", - "id": "chitin_plate", - "symbol": "]", - "color": "yellow", - "name": "chitin armor kit", - "description": "Light chitin plating made for a vehicle.", - "price": 1200, - "material": [ "chitin" ], - "weight": 2000, - "volume": 22, - "bashing": 8, - "to_hit": -4, - "category": "veh_parts" - }, - { - "type": "GENERIC", - "id": "acidchitin_plate", - "copy-from": "chitin_plate", - "name": "biosilicified chitin armor kit", - "description": "Durable silica-coated chitin plating made for a vehicle.", - "material": [ "acidchitin" ], - "proportional": { "price": 1.333, "weight": 1.2, "volume": 1.18, "bashing": 1.25 } - }, - { - "type": "GENERIC", - "id": "bone_plate", - "symbol": "]", - "color": "white", - "name": "bone armor kit", - "description": "Bone plating made for a vehicle.", - "price": 1200, - "material": [ "bone" ], - "weight": 4000, - "volume": 38, - "bashing": 8, - "to_hit": -4, - "category": "veh_parts" - }, - { - "type": "GENERIC", - "id": "drive_by_wire_controls", - "name": "drive by wire controls", - "name_plural": "sets of drive by wire controls", - "description": "Fully electronic vehicle control system. You could control it remotely if you had proper tools.", - "weight": 3000, - "to_hit": -4, - "color": "red", - "symbol": "$", - "material": [ "plastic", "steel" ], - "volume": 15, - "bashing": 1, - "category": "veh_parts", - "price": 200000 - }, { "type": "GENERIC", "id": "mountable_heater", @@ -1197,6 +123,22 @@ "category": "veh_parts", "price": 20000 }, + { + "type": "GENERIC", + "id": "mountable_cooler", + "name": "vehicle cooler", + "name_plural": "vehicle coolers", + "description": "A vehicle-mounted area cooler.", + "weight": 12500, + "to_hit": -4, + "color": "light_cyan", + "symbol": "C", + "material": [ "steel" ], + "volume": 30, + "bashing": 12, + "category": "veh_parts", + "price": 20000 + }, { "type": "GENERIC", "id": "camera_control", @@ -1225,139 +167,6 @@ "category": "veh_parts", "price": 10000 }, - { - "type": "GENERIC", - "id": "robot_controls", - "name": "robot driving unit", - "name_plural": "robot driving units", - "description": "A set of servos, microcontrollers and other devices, together capable of driving an unmanned vehicle. Its AI is not functional, but it should still have some sort of maintenance mode.", - "weight": 2000, - "to_hit": -4, - "color": "white", - "symbol": "&", - "material": [ "plastic", "steel" ], - "volume": 20, - "bashing": 1, - "category": "veh_parts", - "price": 20000 - }, - { - "type": "GENERIC", - "id": "v_scoop_item", - "name": "vehicle scoop", - "symbol": "u", - "color": "light_gray", - "name_plural": "vehicle scoops", - "description": "An assembly of motors and sheet metal that allows a vehicle to clean the road surface by removing debris and contaminants.", - "weight": 22666, - "bashing": 1, - "material": "steel", - "category": "veh_parts", - "price": 3500, - "volume": 28 - }, - { - "type": "GENERIC", - "id": "v_planter_item", - "symbol": "8", - "name": "seed drill", - "name_plural": "seed drills", - "color": "light_gray", - "description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land.", - "weight": 22666, - "bashing": 1, - "material": [ "steel", "plastic" ], - "category": "veh_parts", - "price": 3500, - "volume": 28 - }, - { - "type": "GENERIC", - "id": "v_reaper_item", - "symbol": "/", - "name": "reaper", - "name_plural": "reapers", - "color": "light_gray", - "description": "An assembly of a blade, wheels, and a small lever for engaging/disengaging used to cut down crops prior to picking them up.", - "weight": 22666, - "bashing": 1, - "material": [ "steel", "plastic" ], - "category": "veh_parts", - "price": 3500, - "volume": 28 - }, - { - "type": "GENERIC", - "id": "v_reaper_item_advanced", - "symbol": "/", - "name": "advanced reaper", - "name_plural": "advanced reapers", - "color": "light_gray", - "description": "An advanced electronic device used to cut down, collect and store crops.", - "weight": 25000, - "bashing": 1, - "material": [ "steel", "plastic" ], - "category": "veh_parts", - "price": 50000, - "volume": 36 - }, - { - "type": "GENERIC", - "id": "v_planter_item_advanced", - "symbol": "8", - "name": "advanced seed drill", - "name_plural": "advanced seed drills", - "color": "dark_gray", - "description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land. This one is equipped with an electronic control system and will avoid damaging itself when used on untilled land.", - "weight": 32666, - "bashing": 1, - "material": [ "steel", "plastic" ], - "category": "veh_parts", - "price": 50000, - "volume": 29 - }, - { - "type": "GENERIC", - "id": "v_plow_item", - "symbol": "&", - "name": "plow", - "name_plural": "plows", - "color": "dark_gray", - "description": "A heavy assembly of wheels and steel blades that turn up the ground.", - "weight": 32666, - "bashing": 1, - "material": [ "steel", "plastic" ], - "category": "veh_parts", - "price": 3500, - "volume": 29 - }, - { - "id": "car_headlight", - "type": "GENERIC", - "name": "car headlight", - "description": "A vehicle headlight to light up the way.", - "symbol": ";", - "color": "white", - "material": "plastic", - "category": "veh_parts", - "weight": 1000, - "volume": 4, - "price": 3000 - }, - { - "id": "car_wide_headlight", - "type": "GENERIC", - "name": "wide-angle car headlight", - "description": "A wide-angle vehicle headlight to light up the way.", - "symbol": ";", - "color": "white", - "material": "plastic", - "category": "veh_parts", - "looks_like": "car_headlight", - "weight": 2000, - "volume": 5, - "price": 4000 - }, { "id": "cargo_lock", "type": "GENERIC", diff --git a/data/json/martialarts_fictional.json b/data/json/martialarts_fictional.json index 30a0c304d8f5e..bb960da5b2d60 100644 --- a/data/json/martialarts_fictional.json +++ b/data/json/martialarts_fictional.json @@ -228,44 +228,5 @@ "unarmed_allowed": true, "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ], "messages": [ "You swiftly hit %s", " swiftly hits %s" ] - }, - { - "type": "technique", - "id": "tec_snake_rapid", - "name": "Snake Snap", - "min_unarmed": 2, - "unarmed_allowed": true, - "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ], - "messages": [ "You swiftly jab %s", " swiftly jabs %s" ] - }, - { - "type": "technique", - "id": "tec_snake_feint", - "name": "Snake Slide", - "min_unarmed": 3, - "unarmed_allowed": true, - "defensive": true, - "miss_recovery": true, - "messages": [ "You make serpentine hand motions at %s", " makes serpentine hand motions at %s" ] - }, - { - "type": "technique", - "id": "tec_snake_break", - "name": "Snake Slither", - "min_unarmed": 4, - "unarmed_allowed": true, - "defensive": true, - "grab_break": true, - "messages": [ "You slither free", " slithers free" ] - }, - { - "type": "technique", - "id": "tec_snake_precise", - "name": "Snake Strike", - "min_unarmed": 4, - "unarmed_allowed": true, - "crit_tec": true, - "messages": [ "You strike out at %s", " strikes out at %s" ], - "stun_dur": 2 } ] diff --git a/data/json/player_activities.json b/data/json/player_activities.json index f0a26b2a8bfbd..29458d54e3c1c 100644 --- a/data/json/player_activities.json +++ b/data/json/player_activities.json @@ -582,6 +582,15 @@ "based_on": "neither", "no_resume": true }, + { + "id": "ACT_SPELLCASTING", + "type": "activity_type", + "activity_level": "LIGHT_EXERCISE", + "stop_phrase": "Stop casting?", + "suspendable": false, + "based_on": "speed", + "no_resume": true + }, { "id": "ACT_STUDY_SPELL", "type": "activity_type", diff --git a/data/json/recipes/ammo/components.json b/data/json/recipes/ammo/components.json index 82b98772208ed..c27d89b2192a3 100644 --- a/data/json/recipes/ammo/components.json +++ b/data/json/recipes/ammo/components.json @@ -6,7 +6,7 @@ "subcategory": "CSC_AMMO_COMPONENTS", "skill_used": "cooking", "difficulty": 4, - "time": 15000, + "time": "15 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "recipe_bullets", 3 ], [ "textbook_anarch", 0 ] ], "using": [ [ "surface_heat", 25 ] ], "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -20,7 +20,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 4 ], - "time": 3000, + "time": "3 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 5 ], [ "recipe_bullets", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "DRILL", "level": 2 } ], @@ -35,7 +35,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 3 ], - "time": 2100, + "time": "2 m", "batch_time_factors": [ 80, 5 ], "book_learn": [ [ "manual_pistol", 5 ], [ "recipe_bullets", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "DRILL", "level": 2 } ], diff --git a/data/json/recipes/ammo/grenades.json b/data/json/recipes/ammo/grenades.json index 153d978a84e4a..18f7cda00b535 100644 --- a/data/json/recipes/ammo/grenades.json +++ b/data/json/recipes/ammo/grenades.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 2 ], - "time": 3750, + "time": "3 m", "batch_time_factors": [ 50, 10 ], "reversible": true, "book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ], @@ -24,7 +24,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 2 ], - "time": 3750, + "time": "3 m", "batch_time_factors": [ 50, 10 ], "reversible": true, "book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ], diff --git a/data/json/recipes/ammo/pistol.json b/data/json/recipes/ammo/pistol.json index bb13dd33ffa3a..ccac11db2cffe 100644 --- a/data/json/recipes/ammo/pistol.json +++ b/data/json/recipes/ammo/pistol.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 1000, + "time": "1 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 3 ] ], "charges": 1, @@ -27,7 +27,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 1000, + "time": "1 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 3 ] ], "charges": 1, @@ -47,7 +47,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 4 ] ], "charges": 1, @@ -62,7 +62,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 5 ] ], "charges": 1, @@ -77,7 +77,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], "charges": 1, @@ -92,7 +92,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 1 ], [ "recipe_bullets", 2 ] ], "charges": 1, @@ -107,7 +107,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 3 ] ], "charges": 1, @@ -122,7 +122,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], "charges": 1, @@ -137,7 +137,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], "charges": 1, @@ -152,7 +152,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], "charges": 1, @@ -167,7 +167,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], "charges": 1, @@ -182,7 +182,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ], "charges": 1, @@ -197,7 +197,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], "charges": 1, @@ -212,7 +212,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 4 ], [ "manual_smg", 4 ] ], "charges": 1, @@ -227,7 +227,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "gun", 7 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 6 ], [ "manual_pistol", 7 ] ], "charges": 1, @@ -242,7 +242,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -257,7 +257,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], "charges": 1, @@ -272,7 +272,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], "charges": 1, @@ -287,7 +287,7 @@ "skill_used": "fabrication", "difficulty": 9, "skills_required": [ "gun", 7 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 7 ], [ "manual_pistol", 8 ] ], "charges": 1, @@ -302,7 +302,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -317,7 +317,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 3 ] ], "charges": 1, @@ -332,7 +332,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 1 ], [ "manual_smg", 1 ], [ "recipe_bullets", 2 ] ], "charges": 1, @@ -347,7 +347,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ], "charges": 1, @@ -362,7 +362,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 4 ], [ "manual_smg", 4 ] ], "charges": 1, @@ -377,7 +377,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], "charges": 1, @@ -392,7 +392,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], "charges": 1, @@ -407,7 +407,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], "charges": 1, @@ -422,7 +422,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], "charges": 1, @@ -437,7 +437,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 1 ], [ "manual_smg", 1 ], [ "recipe_bullets", 2 ] ], "charges": 1, @@ -452,7 +452,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ], "charges": 1, @@ -467,7 +467,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], "charges": 1, diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json index 39b90edf9aeca..67b611899bd8b 100644 --- a/data/json/recipes/ammo/rifle.json +++ b/data/json/recipes/ammo/rifle.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 1000, + "time": "1 m", "batch_time_factors": [ 60, 5 ], "autolearn": true, "charges": 1, @@ -23,7 +23,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 1000, + "time": "1 m", "batch_time_factors": [ 60, 5 ], "autolearn": true, "charges": 1, @@ -39,7 +39,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], "charges": 1, @@ -54,7 +54,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], "charges": 1, @@ -69,7 +69,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 1 ], [ "mag_rifle", 2 ] ], "charges": 1, @@ -84,7 +84,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 1 ], [ "mag_rifle", 3 ] ], "charges": 1, @@ -99,7 +99,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 4 ], [ "mag_rifle", 5 ] ], "charges": 1, @@ -114,7 +114,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -129,7 +129,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -144,7 +144,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "gun", 7 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 2 ] ], "charges": 1, @@ -165,7 +165,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -185,7 +185,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_caseless", 4 ] ], "charges": 1, @@ -207,7 +207,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required": [ "gun", 7 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 6 ] ], "charges": 1, @@ -222,7 +222,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required": [ "gun", 7 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 8 ] ], "charges": 1, @@ -243,7 +243,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required": [ "gun", 7 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 7 ] ], "charges": 1, @@ -264,7 +264,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 2 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "charges": 1, @@ -279,7 +279,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 3 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "charges": 1, @@ -294,7 +294,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -309,7 +309,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 5 ] ], "charges": 1, @@ -330,7 +330,7 @@ "skill_used": "fabrication", "difficulty": 9, "skills_required": [ "gun", 7 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 7 ] ], "charges": 1, @@ -345,7 +345,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -365,7 +365,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 5 ] ], "charges": 1, @@ -386,7 +386,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "gun", 4 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], "charges": 1, @@ -401,7 +401,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "charges": 1, @@ -416,7 +416,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "gun", 5 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], "charges": 1, diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json index 8fc93cb3e1aaf..3badad1a608d0 100644 --- a/data/json/recipes/ammo/shot.json +++ b/data/json/recipes/ammo/shot.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "charges": 1, @@ -22,7 +22,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_shotgun", 1 ] ], "charges": 1, @@ -37,7 +37,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ], "charges": 1, @@ -53,7 +53,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, @@ -68,7 +68,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 2000, + "time": "2 m", "batch_time_factors": [ 50, 5 ], "autolearn": true, "charges": 2, @@ -84,7 +84,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 100, + "time": "0 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 2 ], [ "pocket_survival", 2 ], [ "mag_survival", 2 ] ], "charges": 1, diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json index d07ac1a06adf6..aa83d96699d54 100644 --- a/data/json/recipes/armor/arms.json +++ b/data/json/recipes/armor/arms.json @@ -6,7 +6,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "fabrication", "difficulty": 1, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 4 ] ], @@ -20,7 +20,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -32,7 +32,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ] ] }, @@ -44,7 +44,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ] ], - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 6 ] ] ] @@ -56,7 +56,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 3, - "time": 25000, + "time": "25 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], "using": [ [ "sewing_standard", 25 ] ], "tools": [ [ [ "soldering_iron", 15 ], [ "welder", 15 ], [ "hotplate", 15 ], [ "toolset", 15 ] ] ], @@ -69,7 +69,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 3, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 16 ] ], "components": [ [ [ "leather", 12 ], [ "tanned_hide", 2 ], [ "fur", 12 ], [ "tanned_pelt", 2 ] ] ] @@ -81,7 +81,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "fabrication", "difficulty": 7, - "time": 180000, + "time": "180 m", "book_learn": [ [ "textbook_armwest", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -97,7 +97,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_melee", 3 ] ], "using": [ [ "cordage", 1 ] ], @@ -110,7 +110,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_ARMS", "skill_used": "survival", - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "paper", 60 ] ], [ [ "duct_tape", 10 ] ] ], "flags": [ "BLIND_HARD" ] @@ -122,7 +122,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 3, - "time": 15000, + "time": "15 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], "using": [ [ "sewing_standard", 20 ] ], "tools": [ [ [ "soldering_iron", 10 ], [ "welder", 10 ], [ "hotplate", 10 ], [ "toolset", 10 ] ] ], @@ -135,7 +135,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "fabrication", "difficulty": 4, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ], @@ -148,7 +148,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 1, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 32 ] ], "components": [ [ [ "rag", 40 ] ] ] @@ -161,7 +161,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "stockings", 4 ] ], [ [ "rag", 8 ] ] ] @@ -173,7 +173,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "leather", 4 ], [ "tanned_hide", 1 ], [ "fur", 4 ], [ "tanned_pelt", 1 ] ] ] @@ -185,7 +185,7 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "fabrication", "difficulty": 7, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 3 ] ], "components": [ [ [ "link_sheet", 3 ] ], [ [ "chain_link", 75 ] ], [ [ "wire", 1 ] ], [ [ "rag", 6 ] ] ] diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index ad6819c95307b..1b287e255daa2 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -6,7 +6,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "filament", 140, "LIST" ] ] ] @@ -18,7 +18,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "leather", 10 ], [ "tanned_hide", 2 ] ] ] @@ -30,7 +30,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "cordage", 1 ] ], "components": [ [ [ "chitin_piece", 8 ] ], [ [ "leather", 4 ], [ "fur", 4 ], [ "rag", 4 ] ] ] @@ -43,7 +43,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ] ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "cordage", 1 ] ], "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], @@ -57,7 +57,7 @@ "skill_used": "tailor", "difficulty": 8, "skills_required": [ "fabrication", 6 ], - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -77,7 +77,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 40000, + "time": "40 m", "autolearn": true, "book_learn": [ [ "textbook_survival", 1 ] ], "using": [ [ "sewing_standard", 13 ] ], @@ -91,7 +91,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 6 ], - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -111,7 +111,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 60 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -131,7 +131,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 24 ] ], "components": [ [ [ "leather", 18 ], [ "tanned_hide", 3 ], [ "fur", 18 ], [ "tanned_pelt", 3 ] ] ] @@ -144,7 +144,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 3 ], - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -162,7 +162,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "fabrication", "difficulty": 5, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_armwest", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], @@ -179,7 +179,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -197,7 +197,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 5, - "time": 35000, + "time": "35 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 5 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "leather", 9 ], [ "tanned_hide", 2 ] ] ] @@ -209,7 +209,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 6, - "time": 360000, + "time": "360 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "components": [ [ [ "felt_patch", 20 ] ], [ [ "bag_plastic", 8 ] ] ] @@ -222,7 +222,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -241,7 +241,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "sewing_standard", 160 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -260,7 +260,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "fabrication", "difficulty": 3, - "time": 80000, + "time": "80 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 2 ], [ "stick", 2 ] ] ] @@ -272,7 +272,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "fabrication", "difficulty": 1, - "time": 40000, + "time": "40 m", "book_learn": [ [ "tailor_japanese", 2 ] ], "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 1 ] ], [ [ "string_6", 1 ] ] ] @@ -283,7 +283,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "rag", 6 ] ] ], @@ -295,7 +295,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", - "time": 1500, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "fur", 9 ] ] ], @@ -307,7 +307,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", - "time": 1500, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "leather", 9 ] ] ], @@ -319,7 +319,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "felt_patch", 6 ] ] ], @@ -332,7 +332,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "sewing_standard", 5 ] ], "components": [ [ [ "leather", 3 ] ] ] @@ -344,7 +344,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "textbook_survival", 0 ], [ "pocket_survival", 0 ] ], "using": [ [ "sewing_standard", 5 ] ], @@ -357,7 +357,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 6, - "time": 24000, + "time": "24 m", "book_learn": [ [ "textbook_fireman", 6 ], [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "nomex", 9 ] ] ] @@ -369,7 +369,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "book_learn": [ [ "textbook_survival", 1 ], [ "pocket_survival", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -381,7 +381,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", - "time": 10000, + "time": "10 m", "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], "components": [ [ [ "rag", 2 ] ] ] @@ -392,7 +392,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_FEET", "skill_used": "survival", - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ [ "plastic_shopping_bag", 2 ] ] ], "flags": [ "BLIND_HARD" ] @@ -404,7 +404,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 1, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 75 ] ] ] @@ -416,7 +416,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "using": [ [ "sewing_standard", 6 ] ], "components": [ [ [ "rag", 8 ] ] ] @@ -428,7 +428,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 1, - "time": 28000, + "time": "28 m", "autolearn": true, "components": [ [ [ "straw_pile", 4 ], [ "birchbark", 6 ] ] ] }, @@ -440,7 +440,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "tailor", 2 ], - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_swimming", 3 ], [ "manual_swimming", 2 ] ], "using": [ [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -454,7 +454,7 @@ "skill_used": "electronics", "difficulty": 4, "skills_required": [ "tailor", 2 ], - "time": 60000, + "time": "60 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 6 ] ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], @@ -467,7 +467,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 4, - "time": 120000, + "time": "120 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "soldering_iron", 5 ], [ "welder", 5 ], [ "hotplate", 5 ], [ "toolset", 5 ] ] ], diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index ae3e641ec3ffe..5ff933aed951c 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -6,7 +6,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ] ] }, @@ -18,7 +18,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ] ], - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 6 ] ] ] @@ -30,7 +30,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ], [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ] @@ -41,7 +41,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HANDS", "skill_used": "survival", - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ [ "plastic_shopping_bag", 2 ] ] ], "flags": [ "BLIND_HARD" ] @@ -52,7 +52,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", - "time": 16000, + "time": "16 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "gloves_leather", 1 ] ] ] @@ -65,7 +65,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 3, - "time": 16000, + "time": "16 m", "autolearn": true, "book_learn": [ [ "manual_tailor", 2 ], [ "textbook_tailor", 2 ], [ "recipe_melee", 2 ] ], "using": [ [ "sewing_standard", 5 ] ], @@ -79,7 +79,7 @@ "skill_used": "tailor", "difficulty": 1, "skills_required": [ "fabrication", 1 ], - "time": 24000, + "time": "24 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -93,7 +93,7 @@ "skill_used": "tailor", "difficulty": 8, "skills_required": [ "fabrication", 6 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], @@ -113,7 +113,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 16000, + "time": "16 m", "autolearn": true, "book_learn": [ [ "manual_tailor", 1 ], [ "textbook_survival", 1 ], [ "pocket_survival", 1 ] ], "using": [ [ "sewing_standard", 6 ] ], @@ -127,7 +127,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 6 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], @@ -146,7 +146,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], @@ -172,7 +172,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 2, - "time": 16000, + "time": "16 m", "autolearn": true, "book_learn": [ [ "manual_tailor", 1 ], [ "mag_tailor", 0 ], [ "textbook_survival", 1 ], [ "pocket_survival", 1 ] ], "using": [ [ "sewing_standard", 6 ] ], @@ -185,7 +185,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -197,7 +197,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 1, - "time": 10000, + "time": "10 m", "book_learn": [ [ "manual_tailor", 1 ], [ "mag_tailor", 0 ], [ "textbook_survival", 2 ], [ "pocket_survival", 2 ] ], "using": [ [ "sewing_standard", 2 ] ], "components": [ [ [ "rag", 2 ] ] ] @@ -210,7 +210,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 3 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], @@ -235,7 +235,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "fabrication", "difficulty": 6, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_armwest", 5 ] ], "using": [ [ "forging_standard", 15 ], [ "steel_standard", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -250,7 +250,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], @@ -275,7 +275,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 1, - "time": 90000, + "time": "90 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "felt_patch", 4 ] ] ] @@ -287,7 +287,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 2, - "time": 20000, + "time": "20 m", "book_learn": [ [ "manual_tailor", 2 ], [ "mag_tailor", 3 ], [ "textbook_survival", 2 ] ], "using": [ [ "sewing_standard", 6 ] ], "components": [ [ [ "leather", 2 ], [ "gloves_leather", 1 ] ], [ [ "rag", 2 ], [ "gloves_light", 1 ] ] ] @@ -298,7 +298,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "rag", 4 ] ] ], @@ -310,7 +310,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", - "time": 1500, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "fur", 6 ] ] ], @@ -322,7 +322,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", - "time": 1500, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "leather", 6 ] ] ], @@ -334,7 +334,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "felt_patch", 4 ] ] ], @@ -348,7 +348,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], @@ -374,7 +374,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], @@ -393,7 +393,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 1, - "time": 50000, + "time": "50 m", "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 250 ] ] ] @@ -405,7 +405,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 6, - "time": 24000, + "time": "24 m", "book_learn": [ [ "textbook_fireman", 6 ], [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "nomex", 6 ] ] ] @@ -416,7 +416,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HANDS", "skill_used": "survival", - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ [ "socks", 1 ] ] ], "flags": [ "BLIND_EASY" ] @@ -429,7 +429,7 @@ "skill_used": "electronics", "difficulty": 4, "skills_required": [ "tailor", 2 ], - "time": 80000, + "time": "80 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 8 ], [ "soldering_standard", 20 ] ], "components": [ [ [ "rag", 4 ], [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], [ [ "element", 2 ] ], [ [ "cable", 2 ] ] ] @@ -441,7 +441,7 @@ "subcategory": "CSC_ARMOR_HANDS", "skill_used": "tailor", "difficulty": 4, - "time": 60000, + "time": "60 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 5 ] ], "tools": [ [ [ "soldering_iron", 3 ], [ "welder", 3 ], [ "hotplate", 3 ], [ "toolset", 3 ] ] ], diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index b39afb01dbd11..82322fa522d4b 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -7,7 +7,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 5000, + "time": "5 m", "autolearn": true, "using": [ [ "sewing_standard", 3 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -18,7 +18,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 2 ] ], @@ -31,7 +31,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "felt_patch", 4 ] ] ] @@ -44,7 +44,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 1, - "time": 3000, + "time": "3 m", "reversible": true, "autolearn": true, "components": [ [ [ "duct_tape", 10 ] ] ], @@ -56,7 +56,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 3000, + "time": "3 m", "reversible": true, "autolearn": true, "components": [ @@ -90,7 +90,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "sewing_standard", 16 ] ], "components": [ [ [ "leather", 8 ], [ "tanned_hide", 1 ] ] ] @@ -102,7 +102,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 4, - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "components": [ [ [ "felt_patch", 8 ] ] ] @@ -114,7 +114,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 6, - "time": 600000, + "time": "600 m", "book_learn": [ [ "jewelry_book", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -127,7 +127,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -140,7 +140,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -153,7 +153,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "string_36", 1 ], [ "string_6", 2 ] ], [ [ "bottle_plastic", 1 ], [ "bottle_plastic_small", 2 ] ] ] @@ -166,7 +166,7 @@ "skill_used": "electronics", "difficulty": 6, "skills_required": [ "tailor", 1 ], - "time": 40000, + "time": "40 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_fireman", 6 ], [ "advanced_electronics", 5 ], [ "textbook_electronics", 6 ] ], @@ -187,7 +187,7 @@ "skill_used": "electronics", "difficulty": 5, "skills_required": [ "tailor", 1 ], - "time": 40000, + "time": "40 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_fireman", 7 ], [ "advanced_electronics", 4 ], [ "textbook_electronics", 4 ] ], @@ -206,7 +206,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "components": [ [ [ "goggles_ski", 1 ], [ "goggles_welding", 1 ], [ "glasses_safety", 1 ] ], @@ -222,7 +222,7 @@ "skill_used": "mechanics", "difficulty": 2, "skills_required": [ "fabrication", 1 ], - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 3 ], [ "welding_book", 3 ] ], "components": [ @@ -238,7 +238,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": 25000, + "time": "25 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -250,7 +250,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "rag", 3 ] ] ] @@ -263,7 +263,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "fur", 3 ] ] ] @@ -275,7 +275,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 40000, + "time": "40 m", "book_learn": [ [ "textbook_tailor", 2 ], [ "recipe_fauxfur", 1 ] ], "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "faux_fur", 3 ] ] ] @@ -287,7 +287,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 4, - "time": 35000, + "time": "35 m", "autolearn": true, "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 10 ] ] ] @@ -298,7 +298,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 45000, + "time": "45 m", "reversible": true, "autolearn": true, "components": [ [ [ "rag", 1 ], [ "bandana", 1 ] ], [ [ "hat_hard", 1 ] ] ] @@ -310,7 +310,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], "components": [ [ [ "felt_patch", 10 ] ] ] @@ -322,7 +322,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 40000, + "time": "40 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], @@ -335,7 +335,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 8 ], [ "cordage", 2 ] ], @@ -348,7 +348,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 6, - "time": 540000, + "time": "540 m", "book_learn": [ [ "textbook_armwest", 5 ] ], "using": [ [ "forging_standard", 15 ], [ "steel_standard", 10 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -362,7 +362,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 6, - "time": 60000, + "time": "60 m", "autolearn": true, "components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "chitin_piece", 5 ] ] ] }, @@ -373,7 +373,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 6, - "time": 432000, + "time": "432 m", "book_learn": [ [ "textbook_armschina", 5 ] ], "using": [ [ "sewing_standard", 18 ], [ "forging_standard", 3 ], [ "steel_standard", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -388,7 +388,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ] ], - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], "components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "acidchitin_piece", 8 ] ] ] @@ -400,7 +400,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 7, - "time": 432000, + "time": "432 m", "book_learn": [ [ "textbook_armwest", 5 ] ], "using": [ [ "forging_standard", 3 ], [ "steel_standard", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -415,7 +415,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -446,7 +446,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 9, - "time": 600000, + "time": "600 m", "book_learn": [ [ "textbook_armeast", 8 ] ], "using": [ [ "forging_standard", 23 ], [ "steel_standard", 12 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -460,7 +460,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 18 ] ], "components": [ [ [ "leather", 16 ], [ "tanned_hide", 3 ], [ "fur", 16 ], [ "tanned_pelt", 3 ] ] ] @@ -472,7 +472,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 5, - "time": 432000, + "time": "432 m", "book_learn": [ [ "textbook_armwest", 4 ] ], "using": [ [ "forging_standard", 2 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -486,7 +486,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 5, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 65 ] ], "components": [ @@ -502,7 +502,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 7, - "time": 540000, + "time": "540 m", "book_learn": [ [ "textbook_armwest", 6 ] ], "using": [ [ "forging_standard", 18 ], [ "steel_standard", 14 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -517,7 +517,7 @@ "skill_used": "tailor", "difficulty": 8, "skills_required": [ "fabrication", 3 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 65 ], [ "soldering_standard", 8 ] ], "components": [ @@ -535,7 +535,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -567,7 +567,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 84 ], [ "welder_crude", 126 ], [ "soldering_iron", 126 ], [ "toolset", 126 ] ] ], @@ -589,7 +589,7 @@ "skill_used": "tailor", "difficulty": 8, "skills_required": [ "fabrication", 6 ], - "time": 45000, + "time": "45 m", "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ] ], "using": [ [ "sewing_standard", 40 ] ], @@ -604,7 +604,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 6 ], - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -618,7 +618,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 4 ], - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -631,7 +631,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 12000, + "time": "12 m", "autolearn": true, "tools": [ ], "components": [ [ [ "duct_tape", 20 ] ], [ [ "bag_plastic", 2 ] ], [ [ "rag", 2 ] ] ] @@ -644,7 +644,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -664,7 +664,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], @@ -684,7 +684,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -705,7 +705,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -719,7 +719,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 1 ] ], @@ -732,7 +732,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 40000, + "time": "40 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], @@ -745,7 +745,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -758,7 +758,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 60000, + "time": "60 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], @@ -770,7 +770,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 15000, + "time": "15 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 9 ] ], @@ -785,7 +785,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "fabrication", 1 ], - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 3, "book_learn": [ @@ -810,7 +810,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 8 ], - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ], [ "atomic_survival", 8 ], [ "textbook_gaswarfare", 9 ] ], "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], @@ -825,7 +825,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 8 ], - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ], [ "atomic_survival", 8 ], [ "textbook_gaswarfare", 9 ] ], "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], @@ -840,7 +840,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "fabrication", 1 ], - "time": 20000, + "time": "20 m", "decomp_learn": 3, "book_learn": [ [ "textbook_fireman", 3 ], @@ -861,7 +861,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ "fabrication", 1 ], - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_fireman", 3 ], [ "atomic_survival", 3 ], @@ -889,7 +889,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ "fabrication", 1 ], - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_fireman", 3 ], [ "atomic_survival", 3 ], @@ -910,7 +910,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 7 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -929,7 +929,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 7 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -948,7 +948,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 7 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -968,7 +968,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "tailor", 5 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -985,7 +985,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 1500, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "tshirt", 1 ], [ "flag_shirt", 1 ], [ "linuxtshirt", 1 ], [ "tshirt_text", 1 ] ] ], @@ -998,7 +998,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 6, - "time": 150000, + "time": "150 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "components": [ [ [ "felt_patch", 8 ] ] ] @@ -1011,7 +1011,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "tailor", 6 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -1030,7 +1030,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 5 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -1049,7 +1049,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 7 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -1068,7 +1068,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "tailor", 7 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -1085,7 +1085,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", - "time": 6000, + "time": "6 m", "autolearn": true, "components": [ [ [ "hat_hard", 1 ], [ "helmet_bike", 1 ] ], @@ -1100,7 +1100,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 6, - "time": 24000, + "time": "24 m", "book_learn": [ [ "textbook_fireman", 6 ], [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "nomex", 6 ] ] ] @@ -1111,7 +1111,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 3 ] ], @@ -1123,7 +1123,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "reversible": true, "autolearn": true, "components": [ [ [ "rag", 4 ] ], [ [ "pot", 1 ] ] ], @@ -1137,7 +1137,7 @@ "skill_used": "electronics", "difficulty": 9, "skills_required": [ "tailor", 1 ], - "time": 80000, + "time": "80 m", "book_learn": [ [ "manual_swimming", 3 ], [ "atomic_survival", 3 ], [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -1159,7 +1159,7 @@ "skill_used": "electronics", "difficulty": 9, "skills_required": [ "tailor", 3 ], - "time": 85000, + "time": "85 m", "book_learn": [ [ "manual_swimming", 3 ], [ "atomic_survival", 3 ], [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -1182,7 +1182,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "electronics", 4 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -1201,7 +1201,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 150 ] ] ] @@ -1214,7 +1214,7 @@ "skill_used": "tailor", "difficulty": 1, "skills_required": [ "survival", 1 ], - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 3 ] ], @@ -1229,7 +1229,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 3 ] ], @@ -1244,7 +1244,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 9000, + "time": "9 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 9 ] ], @@ -1257,7 +1257,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": 80000, + "time": "80 m", "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 300 ] ] ] @@ -1269,7 +1269,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": 45000, + "time": "45 m", "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ], [ "textbook_tailor", 0 ] ], "components": [ [ [ "straw_pile", 7 ], [ "birchbark", 10 ] ] ] }, @@ -1280,7 +1280,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "components": [ [ [ "straw_pile", 3 ], [ "birchbark", 5 ] ] ] }, @@ -1292,7 +1292,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "tailor", 4 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], @@ -1317,7 +1317,7 @@ "skill_used": "electronics", "difficulty": 4, "skills_required": [ "tailor", 2 ], - "time": 80000, + "time": "80 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 8 ], [ "soldering_standard", 20 ] ], "components": [ [ [ "rag", 4 ], [ "scarf", 2 ], [ "scarf_long", 1 ], [ "balclava", 1 ] ], [ [ "element", 2 ] ], [ [ "cable", 6 ] ] ] @@ -1328,7 +1328,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 500, + "time": "0 m", "autolearn": true, "tools": [ ], "components": [ [ [ "aluminum_foil", 4 ] ] ] @@ -1340,7 +1340,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 5, - "time": 65000, + "time": "65 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ @@ -1354,7 +1354,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "rag", 8 ] ] ], @@ -1367,7 +1367,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 4, - "time": 120000, + "time": "120 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "soldering_iron", 5 ], [ "welder", 5 ], [ "hotplate", 5 ], [ "toolset", 5 ] ] ], @@ -1380,7 +1380,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 7, - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 2 ] ], "components": [ [ [ "link_sheet", 2 ] ], [ [ "chain_link", 50 ] ], [ [ "wire", 1 ] ], [ [ "rag", 4 ] ] ] @@ -1391,7 +1391,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "reversible": true, "autolearn": true, "components": [ [ [ "rag", 10 ] ], [ [ "pot_canning", 1 ] ] ], diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 24bb77a3a5a17..702aac23952ca 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -6,7 +6,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "fabrication", "difficulty": 1, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 2 ] ], @@ -20,7 +20,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "using": [ [ "sewing_standard", 15 ] ], @@ -33,7 +33,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "using": [ [ "filament", 15 ] ], @@ -47,7 +47,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "using": [ [ "sewing_standard", 15 ] ], @@ -60,7 +60,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 25000, + "time": "25 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "using": [ [ "sewing_standard", 10 ] ], @@ -73,7 +73,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 3, - "time": 40000, + "time": "40 m", "book_learn": [ [ "textbook_tailor", 2 ], [ "tailor_portfolio", 2 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 7 ] ] ] @@ -85,7 +85,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "using": [ [ "sewing_standard", 15 ] ], @@ -98,7 +98,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "leather", 8 ], [ "tanned_hide", 2 ] ] ] @@ -110,7 +110,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 3, - "time": 50000, + "time": "50 m", "book_learn": [ [ "tailor_japanese", 3 ] ], "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 15 ] ] ] @@ -123,7 +123,7 @@ "//": "zero Encumbrance, without elastic, at skill 2? seems tricky", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -135,7 +135,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "fur", 4 ] ] ] @@ -147,7 +147,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "leather", 4 ] ] ] @@ -159,7 +159,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 45000, + "time": "45 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 5 ], [ "manual_tailor", 3 ], [ "survival_book", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 6 ] ] ] @@ -171,7 +171,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 4, - "time": 90000, + "time": "90 m", "book_learn": [ [ "scots_cookbook", 4 ] ], "using": [ [ "sewing_standard", 30 ] ], "components": [ [ [ "felt_patch", 18 ] ] ] @@ -183,7 +183,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "fabrication", "difficulty": 4, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ], @@ -196,7 +196,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 6 ] ] ] @@ -208,7 +208,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 1, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 10 ] ] ] @@ -220,7 +220,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "fur", 10 ], [ "tanned_pelt", 2 ] ] ] @@ -232,7 +232,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 3, - "time": 15000, + "time": "15 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], "using": [ [ "sewing_standard", 25 ] ], "tools": [ [ [ "soldering_iron", 15 ], [ "welder", 15 ], [ "hotplate", 15 ], [ "toolset", 15 ] ] ], @@ -245,7 +245,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "fabrication", "difficulty": 7, - "time": 190000, + "time": "190 m", "book_learn": [ [ "textbook_armwest", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ], @@ -261,7 +261,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 5, - "time": 45000, + "time": "45 m", "autolearn": true, "book_learn": [ [ "textbook_armwest", 4 ], [ "recipe_melee", 4 ] ], "using": [ [ "cordage", 4 ] ], @@ -277,7 +277,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_LEGS", "skill_used": "survival", - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "paper", 60 ] ], [ [ "duct_tape", 10 ] ] ], "flags": [ "BLIND_HARD" ] @@ -288,7 +288,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", - "time": 3000, + "time": "3 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -299,7 +299,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "autolearn": true, "tools": [ ], "components": [ [ [ "fur", 2 ] ] ] @@ -310,7 +310,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", - "time": 3000, + "time": "3 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "leather", 2 ] ] ] @@ -321,7 +321,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", - "time": 3000, + "time": "3 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "felt_patch", 4 ] ] ] @@ -333,7 +333,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "using": [ [ "sewing_standard", 15 ] ], @@ -347,7 +347,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 6 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "welder", 10 ], [ "welder_crude", 15 ], [ "soldering_iron", 15 ], [ "toolset", 15 ] ] ], @@ -374,7 +374,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "using": [ [ "sewing_standard", 15 ] ], @@ -387,7 +387,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 3, - "time": 48000, + "time": "48 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 2 ] ], @@ -402,7 +402,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ "survival", 1 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 18 ] ], "components": [ [ [ "rag", 10 ] ], [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ] @@ -414,7 +414,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 3, - "time": 40000, + "time": "40 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], "using": [ [ "sewing_standard", 18 ] ], "components": [ [ [ "rag", 10 ] ], [ [ "faux_fur", 6 ] ] ] @@ -426,7 +426,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 4, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "leather", 10 ], [ "tanned_hide", 2 ] ] ] @@ -439,7 +439,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 5 ], - "time": 70000, + "time": "70 m", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], "components": [ @@ -467,7 +467,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 1, - "time": 25000, + "time": "25 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 5 ] ] ] @@ -479,7 +479,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "manual_tailor", 1 ] ], "using": [ [ "sewing_standard", 12 ] ], @@ -492,7 +492,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "pants_cargo", 1 ] ] ] @@ -505,7 +505,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -516,7 +516,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "jeans", 1 ] ] ] @@ -529,7 +529,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "using": [ [ "sewing_standard", 6 ] ], "components": [ [ [ "stockings", 3 ] ], [ [ "rag", 6 ] ] ] @@ -541,7 +541,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 1, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "sewing_standard", 24 ] ], "components": [ [ [ "rag", 30 ] ] ] @@ -553,7 +553,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "fabrication", "difficulty": 7, - "time": 40000, + "time": "40 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 4 ] ], "components": [ [ [ "link_sheet", 4 ] ], [ [ "chain_link", 100 ] ], [ [ "wire", 1 ] ], [ [ "rag", 6 ] ] ] diff --git a/data/json/recipes/armor/other.json b/data/json/recipes/armor/other.json index 9a8637a284a8c..be0feff85291f 100644 --- a/data/json/recipes/armor/other.json +++ b/data/json/recipes/armor/other.json @@ -5,7 +5,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", - "time": 80000, + "time": "80 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], @@ -19,7 +19,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "electronics", 2 ], - "time": 120000, + "time": "120 m", "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 2 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 35 ] ], [ [ "plastic_chunk", 4 ] ], [ [ "element", 8 ] ], [ [ "cable", 10 ] ], [ [ "amplifier", 1 ] ] ] @@ -31,7 +31,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", "difficulty": 6, - "time": 120000, + "time": "120 m", "book_learn": [ [ "jewelry_book", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -44,7 +44,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", "difficulty": 6, - "time": 120000, + "time": "120 m", "book_learn": [ [ "jewelry_book", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -56,7 +56,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", "difficulty": 6, - "time": 120000, + "time": "120 m", "book_learn": [ [ "jewelry_book", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -69,7 +69,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", "difficulty": 6, - "time": 120000, + "time": "120 m", "book_learn": [ [ "jewelry_book", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -81,7 +81,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "type": "recipe", @@ -92,7 +92,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", - "time": 20000, + "time": "20 m", "reversible": true, "autolearn": true, "type": "recipe", @@ -105,7 +105,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 1, - "time": 85000, + "time": "85 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], @@ -119,7 +119,7 @@ "skill_used": "tailor", "difficulty": 1, "skills_required": [ "survival", 1 ], - "time": 80000, + "time": "80 m", "reversible": true, "decomp_learn": 0, "autolearn": true, @@ -133,7 +133,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -150,7 +150,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -167,7 +167,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 5 ] ], "tools": [ [ [ "soldering_standard", 10, "LIST" ], [ "surface_heat", 10, "LIST" ] ] ], @@ -180,7 +180,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 5 ] ], "tools": [ [ [ "soldering_standard", 10, "LIST" ], [ "surface_heat", 10, "LIST" ] ] ], @@ -193,7 +193,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", "difficulty": 4, - "time": 60000, + "time": "60 m", "book_learn": [ [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 1 }, { "id": "WELD", "level": 1 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -206,7 +206,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -223,7 +223,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "mag_animecon", 3 ] ], "using": [ [ "sewing_standard", 5 ] ], "tools": [ [ [ "soldering_standard", 10, "LIST" ], [ "surface_heat", 10, "LIST" ] ] ], @@ -237,7 +237,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "cooking", 1 ], - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 4, "book_learn": [ @@ -265,7 +265,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "fabrication", 2 ], - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -279,7 +279,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "fabrication", 2 ], - "time": 10000, + "time": "10 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -293,7 +293,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "cooking", 1 ], - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 4, "book_learn": [ @@ -321,7 +321,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ "survival", 1 ], - "time": 75000, + "time": "75 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 30 ] ], @@ -335,7 +335,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "survival", 1 ], - "time": 75000, + "time": "75 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -349,7 +349,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_OTHER", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ @@ -369,7 +369,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 3 ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 140 ] ], "components": [ @@ -386,7 +386,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", - "time": 6000, + "time": "6 m", "autolearn": true, "using": [ [ "sewing_standard", 7 ] ], "components": [ [ [ "rag", 5 ] ] ] @@ -397,7 +397,7 @@ "category": "CC_OTHER", "subcategory": "CSC_ARMOR_OTHER", "skill_used": "survival", - "time": 4000, + "time": "4 m", "autolearn": true, "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "towel_soiled", 1 ] ] ] } diff --git a/data/json/recipes/armor/pets_dog.json b/data/json/recipes/armor/pets_dog.json index be01e1465d8f1..140e2cf694769 100644 --- a/data/json/recipes/armor/pets_dog.json +++ b/data/json/recipes/armor/pets_dog.json @@ -6,7 +6,7 @@ "category": "CC_ANIMALS", "subcategory": "CSC_ANIMALS_CANINE ARMOR", "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ], [ "fabrication", 2 ] ], - "time": 150000, + "time": "150 m", "using": [ [ "cordage", 1 ] ], "components": [ [ [ "acidchitin_piece", 12 ] ] ] }, @@ -16,7 +16,7 @@ "copy-from": "armor_chitin", "category": "CC_ANIMALS", "subcategory": "CSC_ANIMALS_CANINE ARMOR", - "time": 75000, + "time": "75 m", "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], "skills_required": [ [ "fabrication", 2 ] ], "using": [ [ "cordage", 1 ] ], @@ -28,7 +28,7 @@ "copy-from": "chainmail_vest", "category": "CC_ANIMALS", "subcategory": "CSC_ANIMALS_CANINE ARMOR", - "time": 52500, + "time": "52 m", "using": [ [ "chainmail_standard", 5 ] ], "components": [ [ [ "link_sheet", 5 ] ], @@ -44,7 +44,7 @@ "category": "CC_ANIMALS", "subcategory": "CSC_ANIMALS_CANINE ARMOR", "difficulty": 1, - "time": 15000, + "time": "15 m", "byproducts": [ [ "leather", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "vest_leather", 1 ] ] ] @@ -57,7 +57,7 @@ "subcategory": "CSC_ANIMALS_CANINE ARMOR", "skill_used": "tailor", "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 15 ] ], @@ -68,7 +68,7 @@ "type": "recipe", "copy-from": "leather_harness_dog", "difficulty": 2, - "time": 30000, + "time": "30 m", "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ] ], [ [ "vest_leather", 1 ] ] ] }, @@ -80,7 +80,7 @@ "subcategory": "CSC_ANIMALS_CANINE ARMOR", "skill_used": "tailor", "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "using": [ [ "sewing_standard", 5 ] ], "components": [ [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ] ], [ [ "leather_harness_dog", 1 ] ] ] @@ -93,7 +93,7 @@ "subcategory": "CSC_ANIMALS_CANINE ARMOR", "skill_used": "tailor", "difficulty": 4, - "time": 75000, + "time": "75 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 20 ] ], @@ -107,7 +107,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "fabrication", 1 ], - "time": 16000, + "time": "16 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "duct_tape", 25 ] ], [ [ "coat_rain", 1 ] ] ] @@ -121,7 +121,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "fabrication", 1 ], - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "duct_tape", 50 ] ], [ [ "bag_plastic", 10 ] ], [ [ "rag", 10 ] ] ] diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 8b630017a0967..4260e1575acf6 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -7,7 +7,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "gun", 1 ], - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SEW", "level": 1 } ], "components": [ @@ -24,7 +24,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 80000, + "time": "80 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 8 ], [ "rag", 8 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 1, "LIST" ] ] ] @@ -37,7 +37,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -54,7 +54,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 18000, + "time": "18 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], [ [ "filament", 60, "LIST" ], [ "cordage", 3, "LIST" ] ] ] @@ -66,7 +66,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 3, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 20 ] ] ] @@ -78,7 +78,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 3, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "leather", 20 ], [ "tanned_hide", 3 ] ], [ [ "scrap", 6 ] ] ] @@ -91,7 +91,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "melee", 1 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "adhesive", 1 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], @@ -105,7 +105,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "gun", 1 ], [ "pistol", 1 ] ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ], [ "cordage", 1 ] ], "components": [ [ [ "leather", 8 ] ] ] @@ -118,7 +118,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "gun", 1 ], [ "rifle", 1 ] ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ], [ "cordage", 1 ] ], "components": [ [ [ "leather", 8 ] ] ] @@ -131,7 +131,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "gun", 1 ], [ "shotgun", 1 ] ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ], [ "cordage", 1 ] ], "components": [ [ [ "leather", 8 ] ] ] @@ -144,7 +144,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "gun", 1 ], [ "shotgun", 1 ] ], - "time": 100000, + "time": "100 m", "autolearn": true, "using": [ [ "sewing_standard", 60 ], [ "cordage", 2 ] ], "components": [ [ [ "leather", 14 ] ] ] @@ -157,7 +157,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "gun", 1 ], [ "rifle", 1 ] ], - "time": 80000, + "time": "80 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "rag", 4 ] ], [ [ "string_6", 4 ], [ "filament", 40, "LIST" ] ] ] @@ -168,7 +168,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "survival", - "time": 800, + "time": "0 m", "reversible": true, "autolearn": true, "components": [ @@ -185,7 +185,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "melee", 1 ], - "time": 65000, + "time": "65 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 3 ] ], [ [ "string_6", 3 ], [ "filament", 10, "LIST" ] ] ] @@ -198,7 +198,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "pistol", 1 ], - "time": 75000, + "time": "75 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 3 ] ], [ [ "string_6", 3 ], [ "filament", 10, "LIST" ] ] ] @@ -211,7 +211,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "archery", 1 ], - "time": 18000, + "time": "18 m", "autolearn": true, "using": [ [ "filament", 40 ] ], "qualities": [ { "id": "SEW", "level": 1 } ], @@ -229,7 +229,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "melee", 1 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "adhesive", 1 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], @@ -243,7 +243,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 78000, + "time": "78 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 4 ], [ "rag", 4 ] ], [ [ "filament", 10, "LIST" ], [ "cordage_short", 1, "LIST" ] ] ] @@ -256,7 +256,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 2 ], - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 25 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mold_plastic", -1 ] ] ], @@ -274,7 +274,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 2, - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 30 ] ], "components": [ [ [ "rag", 40 ], [ "fur", 32 ], [ "tanned_pelt", 6 ], [ "leather", 24 ], [ "tanned_hide", 6 ] ] ] @@ -287,7 +287,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "gun", 1 ] ], - "time": 80000, + "time": "80 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 1, "LIST" ] ] ] @@ -300,7 +300,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "gun", 1 ], [ "launcher", 1 ] ], - "time": 80000, + "time": "80 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "tools": [ [ [ "mold_plastic", -1 ] ] ], @@ -312,7 +312,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "survival", - "time": 600, + "time": "0 m", "reversible": true, "autolearn": true, "components": [ [ [ "raw_leather", 50 ], [ "raw_hleather", 50 ], [ "raw_fur", 50 ] ] ], @@ -324,7 +324,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "survival", - "time": 600, + "time": "0 m", "reversible": true, "autolearn": true, "components": [ [ [ "raw_tainted_leather", 50 ], [ "raw_tainted_fur", 50 ] ] ], @@ -338,7 +338,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "pistol", 1 ], - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 1, "LIST" ] ] ] @@ -350,7 +350,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "fabrication", "difficulty": 2, - "time": 1500, + "time": "1 m", "autolearn": true, "using": [ [ "adhesive", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 3 } ], @@ -362,7 +362,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", - "time": 8000, + "time": "8 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ] ] @@ -375,7 +375,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -391,7 +391,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 68000, + "time": "68 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 3 ], [ "rag", 3 ] ], [ [ "filament", 10, "LIST" ], [ "cordage_short", 1, "LIST" ] ] ] @@ -404,7 +404,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 76000, + "time": "76 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -421,7 +421,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ "fabrication", 2 ], - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "sewing_standard", 15 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mold_plastic", -1 ] ] ], @@ -433,7 +433,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "survival", - "time": 800, + "time": "0 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 1 ] ], @@ -456,7 +456,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "survival", - "time": 800, + "time": "0 m", "reversible": true, "autolearn": true, "components": [ [ [ "sheet", 1 ], [ "blanket", 1 ] ] ], @@ -469,7 +469,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "fabrication", "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "using": [ [ "cordage", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -483,7 +483,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 10000, + "time": "10 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -499,7 +499,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ [ "survival", 1 ], [ "gun", 1 ] ], - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -515,7 +515,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -532,7 +532,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ [ "survival", 2 ], [ "gun", 2 ] ], - "time": 40000, + "time": "40 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -546,7 +546,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "rag", 6 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 1, "LIST" ] ] ] @@ -559,7 +559,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "melee", 1 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "adhesive", 1 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], @@ -573,7 +573,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "melee", 1 ], - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 1, "LIST" ] ] ] @@ -586,7 +586,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "pistol", 1 ], - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 2, "LIST" ] ] ] @@ -599,7 +599,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "melee", 1 ], - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "felt_patch", 7 ], [ "leather", 7 ], [ "fur", 7 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 2, "LIST" ] ] ] @@ -611,7 +611,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 1, - "time": 18000, + "time": "18 m", "autolearn": true, "components": [ [ [ "straw_pile", 5 ], [ "birchbark", 7 ] ] ] }, @@ -623,7 +623,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 6 ], - "time": 100000, + "time": "100 m", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], "components": [ @@ -652,7 +652,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 4 ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 120 ] ], "components": [ @@ -681,7 +681,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 5 ], - "time": 90000, + "time": "90 m", "autolearn": true, "using": [ [ "sewing_standard", 160 ] ], "components": [ @@ -710,7 +710,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ "fabrication", 3 ], - "time": 70000, + "time": "70 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "components": [ @@ -739,7 +739,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 3 ], - "time": 70000, + "time": "70 m", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], "components": [ @@ -766,7 +766,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "survival", - "time": 600, + "time": "0 m", "reversible": true, "autolearn": true, "components": [ [ [ "bag_canvas", 1 ] ] ], @@ -779,7 +779,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 3, - "time": 16000, + "time": "16 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ], [ "leather_belt", 1 ] ], [ [ "leather_pouch", 5 ] ] ] @@ -792,7 +792,7 @@ "skill_used": "tailor", "skills_required": [ [ "throw", 1 ] ], "difficulty": 2, - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 30 ] ], "components": [ [ [ "fur", 32 ], [ "tanned_pelt", 6 ], [ "leather", 32 ], [ "tanned_hide", 6 ] ] ] @@ -805,7 +805,7 @@ "skill_used": "tailor", "skills_required": [ [ "gun", 1 ], [ "throw", 1 ] ], "difficulty": 3, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 6 ] ] ] diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index 8c88c86de97fe..de32b2adc7eb2 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "tailor", 1 ], - "time": 180000, + "time": "180 m", "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_tailor", 8 ], [ "textbook_fireman", 6 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], @@ -21,7 +21,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required": [ "tailor", 2 ], - "time": 220000, + "time": "220 m", "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_fireman", 7 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], @@ -35,7 +35,7 @@ "skill_used": "cooking", "difficulty": 3, "skills_required": [ "tailor", 3 ], - "time": 60000, + "time": "60 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 5 ], @@ -63,7 +63,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 7, - "time": 100000, + "time": "100 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], "using": [ [ "cordage", 2 ] ], @@ -77,7 +77,7 @@ "skill_used": "tailor", "difficulty": 8, "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ] ], - "time": 200000, + "time": "200 m", "autolearn": true, "using": [ [ "cordage", 2 ] ], "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], @@ -90,7 +90,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 5, - "time": 28000, + "time": "28 m", "autolearn": true, "using": [ [ "sewing_standard", 68 ] ], "components": [ [ [ "fur", 48 ], [ "tanned_pelt", 8 ] ] ] @@ -103,7 +103,7 @@ "//": "Whilst the trenchcoat needs 6 skill this'll need at least 4.", "skill_used": "tailor", "difficulty": 5, - "time": 28000, + "time": "28 m", "autolearn": true, "using": [ [ "sewing_standard", 52 ] ], "components": [ [ [ "leather", 30 ], [ "tanned_hide", 5 ], [ "fur", 30 ], [ "tanned_pelt", 5 ] ] ] @@ -115,7 +115,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "fabrication", "difficulty": 8, - "time": 560000, + "time": "560 m", "book_learn": [ [ "textbook_armwest", 7 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 400 ], [ "oxy_torch", 80 ] ] ], @@ -132,7 +132,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "fabrication", "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "components": [ [ [ "cuirass_lightplate", 1 ] ], [ [ "armguard_lightplate", 1 ] ], [ [ "legguard_lightplate", 1 ] ] ] }, @@ -143,7 +143,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "fabrication", "difficulty": 7, - "time": 448000, + "time": "448 m", "book_learn": [ [ "textbook_armwest", 8 ] ], "using": [ [ "forging_standard", 5 ], [ "steel_standard", 5 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -157,7 +157,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 5, - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 90 ] ], "components": [ @@ -176,7 +176,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 90 ] ], "components": [ @@ -196,7 +196,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "tailor", 3 ], - "time": 28000, + "time": "28 m", "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ], "using": [ [ "sewing_standard", 26 ] ], "components": [ [ [ "steel_chunk", 6 ], [ "scrap", 18 ] ], [ [ "armor_larmor", 1 ] ], [ [ "armguard_larmor", 1 ] ] ] @@ -208,7 +208,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "fabrication", "difficulty": 9, - "time": 600000, + "time": "600 m", "book_learn": [ [ "textbook_armwest", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -221,7 +221,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "fabrication", "difficulty": 9, - "time": 560000, + "time": "560 m", "book_learn": [ [ "textbook_armeast", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -239,7 +239,7 @@ "skill_used": "tailor", "difficulty": 8, "skills_required": [ "fabrication", 3 ], - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "sewing_standard", 90 ], [ "soldering_standard", 18 ] ], "components": [ @@ -258,7 +258,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "fabrication", "difficulty": 3, - "time": 100000, + "time": "100 m", "reversible": true, "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], @@ -273,7 +273,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 18000, + "time": "18 m", "reversible": true, "autolearn": true, "components": [ [ [ "chainmail_vest", 1 ] ], [ [ "chainmail_arms", 1 ] ], [ [ "chainmail_legs", 1 ] ], [ [ "gambeson", 1 ] ] ] @@ -285,7 +285,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "autolearn": true, "components": [ @@ -304,7 +304,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 2000, + "time": "2 m", "reversible": true, "autolearn": true, "components": [ [ [ "chainmail_hood", 1 ] ], [ [ "chainmail_hauberk", 1 ] ] ] @@ -316,7 +316,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 25000, + "time": "25 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 18 ] ], @@ -330,7 +330,7 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 25000, + "time": "25 m", "reversible": true, "autolearn": true, "book_learn": [ [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], @@ -344,7 +344,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 25000, + "time": "25 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 18 ] ], @@ -357,7 +357,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 25000, + "time": "25 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 18 ] ], @@ -371,7 +371,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "tailor", 6 ], - "time": 160000, + "time": "160 m", "book_learn": [ [ "textbook_fireman", 8 ], [ "tailor_portfolio", 8 ] ], "using": [ [ "sewing_standard", 200 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], @@ -390,7 +390,7 @@ "skill_used": "tailor", "difficulty": 8, "skills_required": [ "fabrication", 7 ], - "time": 320000, + "time": "320 m", "autolearn": true, "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_fireman", 7 ] ], "using": [ [ "sewing_standard", 200 ] ], @@ -421,7 +421,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], "using": [ [ "sewing_standard", 30 ] ], @@ -435,7 +435,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 6 ], - "time": 300000, + "time": "300 m", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -465,7 +465,7 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 7 ], - "time": 360000, + "time": "360 m", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -496,7 +496,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 48000, + "time": "48 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 20 ] ] ] @@ -508,7 +508,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 86000, + "time": "86 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 40 ] ], "components": [ [ [ "rag", 30 ] ] ] @@ -521,7 +521,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "jumpsuit", 1 ] ], [ [ "rag", 10 ] ] ] @@ -533,7 +533,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 150000, + "time": "150 m", "book_learn": [ [ "tailor_japanese", 4 ] ], "using": [ [ "sewing_standard", 35 ] ], "components": [ [ [ "rag", 25 ] ] ] @@ -546,7 +546,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 6 ], - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], @@ -575,7 +575,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 6, - "time": 24000, + "time": "24 m", "book_learn": [ [ "textbook_fireman", 6 ], [ "tailor_portfolio", 7 ] ], "using": [ [ "sewing_standard", 40 ] ], "components": [ [ [ "nomex", 18 ] ] ] @@ -587,7 +587,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "electronics", "difficulty": 3, - "time": 12000, + "time": "12 m", "reversible": true, "autolearn": true, "components": [ [ [ "shark_suit", 1 ] ], [ [ "cable", 50 ] ] ] @@ -600,7 +600,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 6 ], - "time": 240000, + "time": "240 m", "autolearn": true, "using": [ [ "sewing_standard", 150 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], @@ -631,7 +631,7 @@ "skill_used": "electronics", "difficulty": 4, "skills_required": [ "tailor", 2 ], - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 52 ], [ "soldering_standard", 100 ] ], "components": [ [ [ "rag", 40 ] ], [ [ "element", 18 ] ], [ [ "cable", 37 ] ] ] @@ -645,7 +645,7 @@ "skill_used": "electronics", "difficulty": 4, "skills_required": [ "tailor", 2 ], - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 15 ], [ "soldering_standard", 10 ] ], "components": [ @@ -664,7 +664,7 @@ "skill_used": "electronics", "difficulty": 4, "skills_required": [ "tailor", 2 ], - "time": 200000, + "time": "200 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 30 ], [ "soldering_standard", 60 ] ], "components": [ [ [ "rag", 30 ], [ "union_suit", 1 ] ], [ [ "element", 12 ] ], [ [ "cable", 20 ] ] ] @@ -675,7 +675,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", - "time": 6000, + "time": "6 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 1 ] ], @@ -689,7 +689,7 @@ "//": "OK, I sewed the shirt and pants together, and added laces to the top, so I can put the thing on.", "skill_used": "tailor", "difficulty": 1, - "time": 3500, + "time": "3 m", "reversible": true, "decomp_learn": 0, "book_learn": [ [ "mag_tailor", 0 ], [ "manual_tailor", 0 ], [ "textbook_tailor", 0 ] ], @@ -703,7 +703,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 600000, + "time": "600 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 50 ] ], "tools": [ [ [ "soldering_iron", 20 ], [ "welder", 20 ], [ "hotplate", 20 ], [ "toolset", 20 ] ] ], @@ -716,7 +716,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 450000, + "time": "450 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], "using": [ [ "sewing_standard", 40 ] ], "tools": [ [ [ "soldering_iron", 15 ], [ "welder", 15 ], [ "hotplate", 15 ], [ "toolset", 15 ] ] ], @@ -729,7 +729,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 600000, + "time": "600 m", "autolearn": true, "using": [ [ "sewing_standard", 150 ] ], "components": [ [ [ "felt_patch", 24 ] ] ] @@ -742,7 +742,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 6 ], - "time": 300000, + "time": "300 m", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], @@ -774,7 +774,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 6 ], - "time": 320000, + "time": "320 m", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], @@ -805,7 +805,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 90000, + "time": "90 m", "book_learn": [ [ "tailor_japanese", 3 ] ], "using": [ [ "sewing_standard", 18 ] ], "components": [ [ [ "rag", 16 ] ] ] diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 779fdb38a4034..44f373de23b8b 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -6,7 +6,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "sewing_standard", 30 ] ], "components": [ [ [ "leather", 18 ], [ "tanned_hide", 3 ] ] ] @@ -18,7 +18,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 3, - "time": 240000, + "time": "240 m", "autolearn": true, "book_learn": [ [ "textbook_armschina", 2 ] ], "using": [ [ "sewing_standard", 68 ] ], @@ -35,7 +35,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -47,7 +47,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "fur", 3 ] ] ] @@ -59,7 +59,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], "components": [ [ [ "leather", 3 ] ] ] @@ -71,7 +71,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 5, - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], "components": [ [ [ "felt_patch", 25 ] ] ] @@ -83,7 +83,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "fabrication", "difficulty": 3, - "time": 10000, + "time": "10 m", "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -96,7 +96,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 2 ] ], [ [ "wire", 1 ] ] ] @@ -107,7 +107,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "rag", 9 ] ] ], @@ -119,7 +119,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 1500, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "fur", 12 ] ] ], @@ -131,7 +131,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 1500, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "leather", 12 ] ] ], @@ -143,7 +143,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "felt_patch", 9 ] ] ], @@ -157,7 +157,7 @@ "skill_used": "tailor", "difficulty": 4, "skills_required": [ "survival", 1 ], - "time": 100000, + "time": "100 m", "autolearn": true, "book_learn": [ [ "textbook_survival", 1 ], [ "trappers_companion", 3 ], [ "survival_book", 2 ] ], "using": [ [ "sewing_standard", 20 ] ], @@ -170,7 +170,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 100000, + "time": "100 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 3 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 11 ] ], [ [ "faux_fur", 12 ] ] ] @@ -183,7 +183,7 @@ "skill_used": "tailor", "skills_required": [ "survival", 5 ], "difficulty": 5, - "time": 200000, + "time": "200 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ], "book_learn": [ [ "trappers_companion", 6 ], [ "survival_book", 4 ] ], @@ -196,7 +196,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ ], "components": [ [ [ "duct_tape", 50 ] ], [ [ "bag_plastic", 10 ] ], [ [ "rag", 10 ] ] ] @@ -208,7 +208,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "fabrication", "difficulty": 8, - "time": 190000, + "time": "190 m", "book_learn": [ [ "textbook_armwest", 7 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ], @@ -224,7 +224,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 42000, + "time": "42 m", "autolearn": true, "using": [ [ "sewing_standard", 32 ] ], "components": [ [ [ "rag", 24 ] ] ] @@ -237,7 +237,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "survival", 1 ], - "time": 200000, + "time": "200 m", "autolearn": true, "using": [ [ "sewing_standard", 60 ] ], "components": [ [ [ "fur", 40 ], [ "tanned_pelt", 7 ] ] ] @@ -249,7 +249,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 200000, + "time": "200 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], "using": [ [ "sewing_standard", 60 ] ], "components": [ [ [ "rag", 25 ] ], [ [ "faux_fur", 20 ] ] ] @@ -261,7 +261,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 6, - "time": 200000, + "time": "200 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 60 ] ], @@ -275,7 +275,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 5 ], - "time": 70000, + "time": "70 m", "autolearn": true, "using": [ [ "sewing_standard", 135 ] ], "components": [ @@ -304,7 +304,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 4, - "time": 150000, + "time": "150 m", "autolearn": true, "using": [ [ "sewing_standard", 360 ] ], "components": [ [ [ "leather", 56 ], [ "tanned_hide", 9 ], [ "fur", 56 ], [ "tanned_pelt", 9 ] ], [ [ "rope_6", 2 ] ] ] @@ -316,7 +316,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 5, - "time": 480000, + "time": "480 m", "autolearn": true, "using": [ [ "sewing_standard", 160 ] ], "components": [ [ [ "felt_patch", 33 ] ] ] @@ -328,7 +328,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 5, - "time": 60000, + "time": "60 m", "book_learn": [ [ "tailor_japanese", 5 ] ], "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 20 ] ] ] @@ -340,7 +340,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 14 ] ], "components": [ [ [ "rag", 12 ] ] ] @@ -352,7 +352,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 1, - "time": 20000, + "time": "20 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 15 ] ], @@ -365,7 +365,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 5, - "time": 150000, + "time": "150 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 30 ] ], @@ -379,7 +379,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "fabrication", 3 ], - "time": 96000, + "time": "96 m", "autolearn": true, "using": [ [ "sewing_standard", 30 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -392,7 +392,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 10 ] ] ] @@ -404,7 +404,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 42000, + "time": "42 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "rag", 7 ] ] ] @@ -417,7 +417,7 @@ "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 6 ], - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "sewing_standard", 60 ] ], "tools": [ [ [ "welder", 18 ], [ "welder_crude", 27 ], [ "soldering_iron", 27 ], [ "toolset", 27 ] ] ], @@ -446,7 +446,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 4, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -459,7 +459,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 0, "autolearn": true, @@ -472,7 +472,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 0, "autolearn": true, @@ -485,7 +485,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 0, "autolearn": true, @@ -498,7 +498,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 0, "autolearn": true, @@ -511,7 +511,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 0, "autolearn": true, @@ -525,7 +525,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 5, - "time": 480000, + "time": "480 m", "autolearn": true, "using": [ [ "sewing_standard", 120 ] ], "components": [ [ [ "felt_patch", 30 ] ] ] @@ -537,7 +537,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 4, - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], "components": [ [ [ "felt_patch", 30 ] ] ] @@ -550,7 +550,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 4, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 300 ] ] ] @@ -563,7 +563,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 3, - "time": 35700, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 27 ] ], "components": [ [ [ "rag", 19 ] ] ] @@ -577,7 +577,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 2, - "time": 21000, + "time": "21 m", "autolearn": true, "byproducts": [ [ "rag", 5 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -592,7 +592,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "survival", 1 ], - "time": 200000, + "time": "200 m", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], "components": [ [ [ "fur", 34 ], [ "tanned_pelt", 6 ] ] ] @@ -605,7 +605,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 3, - "time": 200000, + "time": "200 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], "using": [ [ "sewing_standard", 50 ] ], "components": [ [ [ "rag", 20 ] ], [ [ "faux_fur", 12 ] ] ] @@ -619,7 +619,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 2, - "time": 100000, + "time": "100 m", "autolearn": true, "byproducts": [ [ "fur", 6 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -634,7 +634,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 2, - "time": 100000, + "time": "100 m", "autolearn": true, "byproducts": [ [ "faux_fur", 6 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -648,7 +648,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 6, - "time": 200000, + "time": "200 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 50 ] ], @@ -663,7 +663,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 5, - "time": 100000, + "time": "100 m", "autolearn": true, "byproducts": [ [ "leather", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -678,7 +678,7 @@ "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 5, - "time": 35000, + "time": "35 m", "autolearn": true, "byproducts": [ [ "rag", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -693,7 +693,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 5 ], - "time": 59500, + "time": "59 m", "autolearn": true, "using": [ [ "sewing_standard", 115 ] ], "components": [ @@ -724,7 +724,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 2, - "time": 21000, + "time": "21 m", "autolearn": true, "byproducts": [ [ "rag", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -738,7 +738,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 3, - "time": 35700, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 16 ] ] ] @@ -752,7 +752,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 2, - "time": 100000, + "time": "100 m", "autolearn": true, "byproducts": [ [ "fur", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -767,7 +767,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 2, - "time": 100000, + "time": "100 m", "autolearn": true, "byproducts": [ [ "faux_fur", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -782,7 +782,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "survival", 1 ], - "time": 200000, + "time": "200 m", "autolearn": true, "using": [ [ "sewing_standard", 38 ] ], "components": [ [ [ "fur", 28 ], [ "tanned_pelt", 5 ] ] ] @@ -795,7 +795,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 3, - "time": 200000, + "time": "200 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], "using": [ [ "sewing_standard", 38 ] ], "components": [ [ [ "rag", 10 ] ], [ [ "faux_fur", 10 ] ] ] @@ -809,7 +809,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 5, - "time": 100000, + "time": "100 m", "autolearn": true, "byproducts": [ [ "leather", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -823,7 +823,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 6, - "time": 200000, + "time": "200 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 38 ] ], @@ -838,7 +838,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 5 ], - "time": 59500, + "time": "59 m", "autolearn": true, "using": [ [ "sewing_standard", 85 ] ], "components": [ @@ -869,7 +869,7 @@ "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.", "skill_used": "tailor", "difficulty": 5, - "time": 35000, + "time": "35 m", "autolearn": true, "byproducts": [ [ "rag", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -883,7 +883,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 21000, + "time": "21 m", "autolearn": true, "byproducts": [ [ "rag", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -896,7 +896,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "rag", 8 ] ] ] @@ -908,7 +908,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 90000, + "time": "90 m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ], "using": [ [ "sewing_standard", 12 ] ], @@ -921,7 +921,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 360000, + "time": "360 m", "autolearn": true, "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 600 ] ] ] @@ -933,7 +933,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -945,7 +945,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 42000, + "time": "42 m", "autolearn": true, "using": [ [ "sewing_standard", 23 ] ], "components": [ [ [ "rag", 18 ] ] ] @@ -958,7 +958,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "survival", 1 ], - "time": 200000, + "time": "200 m", "autolearn": true, "using": [ [ "sewing_standard", 45 ] ], "components": [ [ [ "fur", 30 ], [ "tanned_pelt", 5 ] ] ] @@ -970,7 +970,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 200000, + "time": "200 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], "using": [ [ "sewing_standard", 45 ] ], "components": [ [ [ "rag", 14 ] ], [ [ "faux_fur", 12 ] ] ] @@ -982,7 +982,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 6, - "time": 200000, + "time": "200 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 45 ] ], @@ -996,7 +996,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 5 ], - "time": 70000, + "time": "70 m", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], "components": [ @@ -1025,7 +1025,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 38000, + "time": "38 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], @@ -1037,7 +1037,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 2000, + "time": "2 m", "autolearn": true, "byproducts": [ [ "rag", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -1050,7 +1050,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 10 ] ] ] @@ -1062,7 +1062,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 4 ] ] ] @@ -1075,7 +1075,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 4, - "time": 80000, + "time": "80 m", "autolearn": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 20 ] ], @@ -1087,7 +1087,7 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", - "time": 20000, + "time": "20 m", "autolearn": true, "byproducts": [ [ "leather", 5 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -1101,7 +1101,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "fabrication", 3 ], - "time": 72000, + "time": "72 m", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -1114,7 +1114,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 5, - "time": 150000, + "time": "150 m", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], "components": [ [ [ "felt_patch", 13 ] ] ] @@ -1126,7 +1126,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "fabrication", "difficulty": 7, - "time": 70000, + "time": "70 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 7 ] ], "components": [ [ [ "link_sheet", 7 ] ], [ [ "chain_link", 175 ] ], [ [ "wire", 1 ] ], [ [ "rag", 6 ] ] ] diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index 962fa6684d641..6ce4629bc3395 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -7,7 +7,7 @@ "subcategory": "CSC_CHEM_FUEL", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook", 4 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ], "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "thermometer", -1 ] ] ], @@ -29,7 +29,7 @@ "subcategory": "CSC_CHEM_FUEL", "skill_used": "cooking", "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook" ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ], "tools": [ [ [ "surface_heat", 60, "LIST" ] ] ], @@ -51,7 +51,7 @@ "skill_used": "cooking", "difficulty": 6, "result_mult": 4, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_biodiesel", 5 ] ], "batch_time_factors": [ 99, 1 ], "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -81,7 +81,7 @@ "subcategory": "CSC_CHEM_FUEL", "skill_used": "cooking", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 0e8d327d73c99..55bbd8d47a085 100644 --- a/data/json/recipes/chem/other.json +++ b/data/json/recipes/chem/other.json @@ -7,7 +7,7 @@ "skill_used": "survival", "difficulty": 2, "skills_required": [ "cooking", 2 ], - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -21,7 +21,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 12000, + "time": "12 m", "autolearn": true, "qualities": [ { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], diff --git a/data/json/recipes/electronics/parts.json b/data/json/recipes/electronics/parts.json index a1ffb5b8a8bd5..d5022bc270eab 100644 --- a/data/json/recipes/electronics/parts.json +++ b/data/json/recipes/electronics/parts.json @@ -7,7 +7,7 @@ "skill_used": "electronics", "difficulty": 3, "skills_required": [ "fabrication", 1 ], - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], @@ -29,7 +29,7 @@ "skill_used": "electronics", "difficulty": 3, "skills_required": [ "fabrication", 1 ], - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], @@ -51,7 +51,7 @@ "skill_used": "electronics", "difficulty": 6, "skills_required": [ "fabrication", 6 ], - "time": 60000, + "time": "60 m", "decomp_learn": 4, "book_learn": [ [ "recipe_atomic_battery", 6 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -66,7 +66,7 @@ "skill_used": "electronics", "difficulty": 6, "skills_required": [ "fabrication", 6 ], - "time": 60000, + "time": "60 m", "decomp_learn": 4, "book_learn": [ [ "recipe_atomic_battery", 6 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -81,7 +81,7 @@ "skill_used": "electronics", "difficulty": 6, "skills_required": [ "fabrication", 6 ], - "time": 60000, + "time": "60 m", "decomp_learn": 4, "book_learn": [ [ "recipe_atomic_battery", 6 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -96,7 +96,7 @@ "skill_used": "electronics", "difficulty": 6, "skills_required": [ "fabrication", 6 ], - "time": 60000, + "time": "60 m", "decomp_learn": 4, "book_learn": [ [ "recipe_atomic_battery", 6 ] ], "using": [ [ "soldering_standard", 10 ] ], diff --git a/data/json/recipes/electronics/toolmod.json b/data/json/recipes/electronics/toolmod.json index f7c42f0a25874..affcf0ec78025 100644 --- a/data/json/recipes/electronics/toolmod.json +++ b/data/json/recipes/electronics/toolmod.json @@ -6,7 +6,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 5, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -29,7 +29,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "fabrication", 7 ], - "time": 60000, + "time": "60 m", "decomp_learn": 4, "book_learn": [ [ "recipe_atomic_battery", 7 ] ], "using": [ [ "soldering_standard", 20 ] ], @@ -43,7 +43,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 2, "autolearn": [ [ "electronics", 4 ], [ "mechanics", 2 ] ], @@ -60,7 +60,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "electronics", 3 ], - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -77,7 +77,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "electronics", 3 ], - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -94,7 +94,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "electronics", 3 ], - "time": 40000, + "time": "40 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -111,7 +111,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 1 ], "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ] ], @@ -127,7 +127,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 1 ], "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ] ], @@ -143,7 +143,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 1 ], "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ] ], @@ -159,7 +159,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 1 ], "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ] ], diff --git a/data/json/recipes/engines.json b/data/json/recipes/engines.json index 3be2a39313560..e2974bdeb2762 100644 --- a/data/json/recipes/engines.json +++ b/data/json/recipes/engines.json @@ -11,7 +11,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 40000, + "time": "40 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -30,7 +30,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 40000, + "time": "40 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -49,7 +49,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 40000, + "time": "40 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -68,7 +68,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 50000, + "time": "50 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -89,7 +89,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 40000, + "time": "40 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -108,7 +108,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 40000, + "time": "40 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -127,7 +127,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 50000, + "time": "50 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -148,7 +148,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 40000, + "time": "40 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -167,7 +167,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 50000, + "time": "50 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -188,7 +188,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 40000, + "time": "40 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], @@ -207,7 +207,7 @@ "skill_used": "mechanics", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "difficulty": 4, - "time": 50000, + "time": "50 m", "components": [ [ [ "drivebelt", 2 ] ], [ [ "filter_air", 1 ] ], diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 547c34f970586..cfc196de2d36a 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -8,7 +8,7 @@ "skill_used": "cooking", "difficulty": 5, "skills_required": [ "survival", 4 ], - "time": 30000, + "time": "30 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "book_learn": [ [ "survival_book", 3 ], [ "textbook_survival", 3 ], [ "manual_survival", 3 ] ], @@ -26,7 +26,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 5, - "time": 25000, + "time": "25 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 5 ], [ "scots_cookbook", 5 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -46,7 +46,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 5, - "time": 50000, + "time": "50 m", "batch_time_factors": [ 50, 4 ], "autolearn": [ [ "cooking", 6 ] ], "book_learn": [ [ "brewing_cookbook", 6 ] ], @@ -76,7 +76,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 5, - "time": 15000, + "time": "15 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 4 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -91,7 +91,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 2, - "time": 40000, + "time": "40 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 1 ], [ "family_cookbook", 1 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -111,7 +111,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 3, - "time": 40000, + "time": "40 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "book_learn": [ [ "brewing_cookbook", 1 ], [ "family_cookbook", 2 ] ], @@ -127,7 +127,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 4, - "time": 80000, + "time": "80 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 4 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -147,7 +147,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 3, - "time": 80000, + "time": "80 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "book_learn": [ [ "brewing_cookbook", 2 ] ], @@ -165,7 +165,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 3, - "time": 80000, + "time": "80 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 3 ], @@ -190,7 +190,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 3, - "time": 80000, + "time": "80 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "survival_book", 3 ], [ "textbook_survival", 3 ], [ "manual_survival", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -209,7 +209,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 3, - "time": 8000, + "time": "8 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "components": [ diff --git a/data/json/recipes/food/distill.json b/data/json/recipes/food/distill.json index 0c01760c41418..6377ef086cbaf 100644 --- a/data/json/recipes/food/distill.json +++ b/data/json/recipes/food/distill.json @@ -6,7 +6,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 3, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 50, 4 ], "autolearn": [ [ "cooking", 4 ] ], "book_learn": [ [ "brewing_cookbook", 2 ] ], @@ -22,7 +22,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 50, 4 ], "autolearn": [ [ "cooking", 6 ] ], "book_learn": [ [ "brewing_cookbook", 4 ] ], @@ -37,7 +37,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 4 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ], @@ -51,7 +51,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 4 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ], @@ -65,7 +65,7 @@ "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", "difficulty": 2, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "brewing_cookbook", 1 ], [ "family_cookbook", 1 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ], diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index 1c723501bfbe5..dcd472b85d74d 100644 --- a/data/json/recipes/food/dry.json +++ b/data/json/recipes/food/dry.json @@ -6,7 +6,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -19,7 +19,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -32,7 +32,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -45,7 +45,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -58,7 +58,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "batch_time_factors": [ 67, 5 ], "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -72,7 +72,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -85,7 +85,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "batch_time_factors": [ 67, 5 ], "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -99,7 +99,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -112,7 +112,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -152,7 +152,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "batch_time_factors": [ 67, 5 ], "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -166,7 +166,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 4, - "time": 12000, + "time": "12 m", "batch_time_factors": [ 83, 3 ], "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -181,7 +181,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 4, - "time": 9000, + "time": "9 m", "batch_time_factors": [ 83, 3 ], "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -196,7 +196,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 1, - "time": 18000, + "time": "18 m", "autolearn": true, "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], "components": [ [ [ "milk", 1 ] ] ] @@ -209,7 +209,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 12, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -222,7 +222,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 4, - "time": 12000, + "time": "12 m", "batch_time_factors": [ 83, 3 ], "autolearn": true, "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -237,7 +237,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 4, - "time": 9000, + "time": "9 m", "batch_time_factors": [ 83, 3 ], "autolearn": true, "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -251,7 +251,7 @@ "subcategory": "CSC_FOOD_DRY", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], diff --git a/data/json/recipes/food/frozen.json b/data/json/recipes/food/frozen.json index c9ff4b45f16dd..88403a0c51f33 100644 --- a/data/json/recipes/food/frozen.json +++ b/data/json/recipes/food/frozen.json @@ -6,7 +6,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ], [ [ "food_processor", 10 ] ] ], @@ -40,7 +40,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 12500, + "time": "12 m", "autolearn": true, "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ], [ [ "food_processor", 10 ] ] ], "components": [ @@ -74,7 +74,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ], [ [ "food_processor", 10 ] ] ], @@ -107,7 +107,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 20000, + "time": "20 m", "book_learn": [ [ "mag_cooking", 0 ] ], "components": [ [ [ "water_clean", 2 ] ], @@ -139,7 +139,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "icecream", 1 ], [ "icecream_artificial", 1 ] ], @@ -153,7 +153,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "icecream", 1 ], [ "icecream_artificial", 1 ] ], [ [ "sweet_fruit_like", 1, "LIST" ], [ "jam_fruit", 1 ] ] ] }, @@ -164,7 +164,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ], [ [ "food_processor", 10 ] ] ], @@ -197,7 +197,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ], [ [ "food_processor", 10 ] ] ], @@ -209,7 +209,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ], [ [ "food_processor", 10 ] ] ], @@ -226,7 +226,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "book_learn": [ [ "cookbook_italian", 1 ] ], "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ], [ [ "food_processor", 10 ] ] ], diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index 7fc6701fd1131..731b7764c2af6 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -7,7 +7,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -54,7 +54,7 @@ "skill_used": "cooking", "difficulty": 6, "charges": 1, - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_cooking", 4 ], [ "mag_glam", 5 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], @@ -72,7 +72,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "scots_cookbook", 2 ], [ "family_cookbook", 0 ], [ "cookbook", 0 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -86,7 +86,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 15000, + "time": "15 m", "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "family_cookbook", 2 ], [ "cookbook", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -107,7 +107,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 45, "LIST" ] ] ], @@ -121,7 +121,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "skills_required": [ "survival", 2 ], - "time": 60000, + "time": "60 m", "charges": 2, "book_learn": [ [ "cookbook", 1 ], [ "scots_cookbook", 2 ] ], "difficulty": 3, @@ -159,7 +159,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "skills_required": [ "survival", 2 ], - "time": 15000, + "time": "15 m", "charges": 2, "book_learn": [ [ "cookbook", 1 ], [ "scots_cookbook", 2 ] ], "difficulty": 3, @@ -173,7 +173,7 @@ "category": "CC_FOOD", "skill_used": "cooking", "difficulty": 5, - "time": 60000, + "time": "60 m", "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "cookbook", 3 ], [ "family_cookbook", 3 ] ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 1 } ], @@ -195,7 +195,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 25000, + "time": "25 m", "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "cookbook", 2 ] ], "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], @@ -215,7 +215,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 83, 5 ], "charges": 1, "book_learn": [ [ "cookbook", 2 ], [ "family_cookbook", 2 ] ], @@ -239,7 +239,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "scots_cookbook", 2 ], [ "cookbook", 1 ], [ "textbook_survival", 3 ] ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -254,7 +254,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 80000, + "time": "80 m", "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], @@ -270,7 +270,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 80000, + "time": "80 m", "batch_time_factors": [ 83, 5 ], "contained": true, "qualities": [ diff --git a/data/json/recipes/food/pasta.json b/data/json/recipes/food/pasta.json index b223b947934c4..557267985fe5b 100644 --- a/data/json/recipes/food/pasta.json +++ b/data/json/recipes/food/pasta.json @@ -5,7 +5,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], @@ -21,7 +21,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], @@ -38,7 +38,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "charges": 3, "book_learn": [ [ "cookbook_italian", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -64,7 +64,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "charges": 4, "book_learn": [ [ "cookbook_italian", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -91,7 +91,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "charges": 4, "book_learn": [ [ "cookbook_human", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -118,7 +118,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "charges": 3, "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -145,7 +145,7 @@ "skill_used": "cooking", "difficulty": 4, "charges": 1, - "time": 20000, + "time": "20 m", "book_learn": [ [ "cookbook_italian", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], @@ -172,7 +172,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ [ [ "surface_heat", 25, "LIST" ] ], [ [ "pastaextruder", -1 ] ] ], "components": [ [ [ "flour", 9 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] @@ -184,7 +184,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ [ [ "surface_heat", 25, "LIST" ] ], [ [ "pastaextruder", -1 ] ] ], "components": [ [ [ "flour", 5 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] @@ -196,7 +196,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ [ [ "surface_heat", 25, "LIST" ] ], [ [ "pastaextruder", -1 ] ] ], "components": [ [ [ "flour", 5 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] @@ -208,7 +208,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ [ [ "surface_heat", 25, "LIST" ] ], [ [ "pastaextruder", -1 ] ] ], "components": [ [ [ "flour", 5 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] @@ -221,7 +221,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], @@ -253,7 +253,7 @@ "subcategory": "CSC_FOOD_PASTA", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "charges": 2, "book_learn": [ [ "cookbook_human", 1 ] ], "qualities": [ { "id": "COOK", "level": 3 } ], diff --git a/data/json/recipes/food/seed.json b/data/json/recipes/food/seed.json index 55316a7eebf34..a3db57a7b2661 100644 --- a/data/json/recipes/food/seed.json +++ b/data/json/recipes/food/seed.json @@ -6,7 +6,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "pumpkin", 1 ] ] ], @@ -19,7 +19,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "cucumber", 1 ] ] ], @@ -42,7 +42,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "corn", 1 ] ] ], @@ -55,7 +55,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "zucchini", 1 ] ] ], @@ -78,7 +78,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "tomato", 1 ] ] ], @@ -91,7 +91,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "cranberries", 1 ] ] ], @@ -104,7 +104,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "blackberries", 1 ] ] ], @@ -117,7 +117,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "blueberries", 1 ] ] ], @@ -130,7 +130,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "raspberries", 1 ] ] ], @@ -143,7 +143,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "strawberries", 1 ] ] ], @@ -156,7 +156,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "elderberries", 1 ] ] ], @@ -169,7 +169,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "mulberries", 1 ] ] ], @@ -182,7 +182,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "huckleberries", 1 ] ] ], @@ -195,7 +195,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "grapes", 1 ] ] ], @@ -208,7 +208,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rose_hips", 1 ] ] ], @@ -221,7 +221,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "chili_pepper", 1 ] ] ], @@ -244,7 +244,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "bee_balm", 1 ] ] ], @@ -257,7 +257,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "buckwheat", 1 ] ] ], @@ -270,7 +270,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "dogbane", 1 ] ] ], @@ -283,7 +283,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "garlic", 1 ] ] ], @@ -296,7 +296,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "mugwort", 1 ] ] ], @@ -309,7 +309,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 4, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "mushroom", 1 ] ] ], @@ -322,7 +322,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 5, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "mushroom_morel", 1 ] ] ], @@ -335,7 +335,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "raw_dandelion", 4 ] ] ], "flags": [ "ALLOW_ROTTEN" ] @@ -347,7 +347,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rhubarb", 4 ] ] ], @@ -360,7 +360,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "thyme", 1 ] ] ], @@ -373,7 +373,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "veggy_wild", 1 ] ] ], @@ -386,7 +386,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "wild_herbs", 20 ] ] ], @@ -399,7 +399,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "potato", 1 ] ] ], @@ -412,7 +412,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "components": [ [ [ "sunflower", 1 ] ] ], "flags": [ "ALLOW_ROTTEN" ] @@ -424,7 +424,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "raw_beans", 1 ] ] ], "flags": [ "ALLOW_ROTTEN" ] @@ -436,7 +436,7 @@ "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "raw_lentils", 1 ] ] ], "flags": [ "ALLOW_ROTTEN" ] diff --git a/data/json/recipes/other/containers.json b/data/json/recipes/other/containers.json index 7e94c2f56e1ea..116b03c8cf143 100644 --- a/data/json/recipes/other/containers.json +++ b/data/json/recipes/other/containers.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ] ], "tools": [ [ [ "brick_kiln", 40 ], [ "kiln", 40 ] ] ], @@ -21,7 +21,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ] ], "tools": [ [ [ "brick_kiln", 60 ], [ "kiln", 60 ] ] ], @@ -35,7 +35,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "cordage_short", 2 ], [ "glazing", 2 ] ], "tools": [ [ [ "brick_kiln", 120 ], [ "kiln", 120 ] ] ], @@ -49,7 +49,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "cordage_short", 2 ], [ "glazing", 3 ] ], "tools": [ [ [ "brick_kiln", 160 ], [ "kiln", 160 ] ] ], @@ -63,7 +63,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 25000, + "time": "25 m", "autolearn": true, "using": [ [ "cordage_short", 2 ], [ "glazing", 1 ] ], "tools": [ [ [ "brick_kiln", 50 ], [ "kiln", 50 ] ] ], @@ -76,7 +76,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 8, - "time": 164062, + "time": "164 m", "autolearn": true, "using": [ [ "forging_standard", 8 ], [ "steel_standard", 13 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -89,7 +89,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "survival", "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "waterproofing", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "BOIL", "level": 1 } ], @@ -107,7 +107,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "survival", "difficulty": 1, - "time": 45000, + "time": "45 m", "autolearn": true, "using": [ [ "waterproofing", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "BOIL", "level": 1 } ], diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index 8424096603874..074419c019bd6 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -6,7 +6,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, - "time": 15000, + "time": "15 m", "batch_time_factors": [ 90, 4 ], "reversible": true, "autolearn": true, @@ -21,7 +21,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": 60000, + "time": "60 m", "batch_time_factors": [ 90, 4 ], "reversible": true, "autolearn": true, @@ -37,7 +37,7 @@ "skill_used": "cooking", "difficulty": 4, "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], - "time": 30000, + "time": "30 m", "batch_time_factors": [ 50, 2 ], "tools": [ [ [ "electrolysis_kit", 100 ] ], [ [ "jar_glass", -1 ], [ "jar_3l_glass", -1 ] ] ], "components": [ [ [ "acid", 1 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "can_food_unsealed", 1 ] ] ] diff --git a/data/json/recipes/other/medical.json b/data/json/recipes/other/medical.json index db944281f6d8c..2a5ebad8e37c1 100644 --- a/data/json/recipes/other/medical.json +++ b/data/json/recipes/other/medical.json @@ -6,7 +6,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "firstaid", "difficulty": 1, - "time": 500, + "time": "0 m", "autolearn": true, "components": [ [ [ "rag", 3 ], [ "medical_gauze", 1 ] ], @@ -20,7 +20,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "tailor", - "time": 150, + "time": "0 m", "autolearn": true, "charges": 1, "components": [ [ [ "rag", 1 ] ] ] @@ -32,7 +32,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "batch_time_factors": [ 95, 4 ], "autolearn": true, "components": [ [ [ "bandages_makeshift", 3 ] ], [ [ "bleach", 1 ] ], [ [ "water_clean", 3 ], [ "water", 3 ] ] ] @@ -44,7 +44,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "batch_time_factors": [ 95, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -59,7 +59,7 @@ "skill_used": "cooking", "difficulty": 4, "skills_required": [ "firstaid", 2 ], - "time": 24000, + "time": "24 m", "book_learn": [ [ "textbook_firstaid", 2 ], [ "manual_first_aid", 2 ], [ "emergency_book", 2 ], [ "pocket_firstaid", 2 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -72,7 +72,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "cooking", "autolearn": true, - "time": 500, + "time": "0 m", "components": [ [ [ "chem_ethanol", 250 ], [ "denat_alcohol", 250 ] ] ] }, { @@ -83,7 +83,7 @@ "skill_used": "cooking", "difficulty": 4, "skills_required": [ "survival", 4 ], - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -97,7 +97,7 @@ "skill_used": "cooking", "difficulty": 4, "skills_required": [ "survival", 4 ], - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -111,7 +111,7 @@ "skill_used": "survival", "difficulty": 1, "skills_required": [ "survival", 1 ], - "time": 5000, + "time": "5 m", "book_learn": [ [ "emergency_book", 1 ], [ "mag_survival", 1 ], @@ -129,7 +129,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "firstaid", "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "components": [ [ [ "rag", 1 ] ], [ [ "disinfectant", 1 ] ] ] @@ -141,7 +141,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "firstaid", "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "components": [ [ [ "cotton_ball", 1 ] ], [ [ "disinfectant", 1 ] ] ] diff --git a/data/json/recipes/other/other.json b/data/json/recipes/other/other.json index 1615cf966abd4..ecd9e5481aeae 100644 --- a/data/json/recipes/other/other.json +++ b/data/json/recipes/other/other.json @@ -5,7 +5,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", "skill_used": "survival", - "time": 1000, + "time": "1 m", "book_learn": [ [ "mag_survival", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ], [ "pocket_survival", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index b9473cc75c286..1cf3307d61cf2 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -6,7 +6,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 9, - "time": 300000, + "time": "300 m", "autolearn": true, "using": [ [ "forging_standard", 5 ], [ "steel_standard", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -20,7 +20,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "welding_standard", 10 ] ], "components": [ [ [ "sheet_metal_small", 24 ] ] ] @@ -32,7 +32,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 5, - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "forging_standard", 1 ], [ "steel_tiny", 1 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -45,7 +45,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 8000, + "time": "8 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 6 ] ], diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index d1025212aa744..84ff1f60cf644 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "survival", 4 ], - "time": 300000, + "time": "300 m", "reversible": true, "book_learn": [ [ "mag_survival", 4 ], [ "manual_survival", 4 ], [ "textbook_survival", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -33,7 +33,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "mechanics", 3 ], - "time": 300000, + "time": "300 m", "book_learn": [ [ "manual_mechanics", 3 ], [ "manual_fabrication", 5 ], [ "textbook_fabrication", 5 ] ], "using": [ [ "forging_standard", 10 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -47,7 +47,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "mechanics", 1 ], - "time": 100000, + "time": "100 m", "book_learn": [ [ "manual_mechanics", 1 ], [ "manual_fabrication", 2 ], [ "textbook_fabrication", 2 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "pipe", 4 ] ], [ [ "scrap", 2 ] ] ] @@ -60,7 +60,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "mechanics", 2 ], - "time": 200000, + "time": "200 m", "book_learn": [ [ "manual_mechanics", 2 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 3 ] ], "using": [ [ "welding_standard", 5 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -73,7 +73,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 7, - "time": 420000, + "time": "420 m", "autolearn": true, "book_learn": [ [ "textbook_carpentry", 5 ], [ "textbook_fabrication", 6 ] ], "using": [ [ "forging_standard", 2 ], [ "steel_standard", 2 ] ], @@ -89,7 +89,7 @@ "skill_used": "fabrication", "skills_required": [ "cooking", 3 ], "difficulty": 4, - "time": 200000, + "time": "200 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "brewing_cookbook", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "pot", 1 ], [ "pot_copper", 1 ] ], [ [ "hose", 2 ] ] ] @@ -101,7 +101,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "electronics", "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "autolearn": true, "using": [ [ "soldering_standard", 20 ] ], @@ -122,7 +122,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 2 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "autolearn": true, "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], @@ -145,7 +145,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 1 ], [ "cooking", 2 ] ], "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "book_learn": [ [ "atomic_survival", 0 ], [ "textbook_survival", 0 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -158,7 +158,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], @@ -172,7 +172,7 @@ "skill_used": "survival", "skills_required": [ "fabrication", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 1 ], [ "cookbook", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], diff --git a/data/json/recipes/other/vehicle.json b/data/json/recipes/other/vehicle.json index 110f856b06908..89b720188af6d 100644 --- a/data/json/recipes/other/vehicle.json +++ b/data/json/recipes/other/vehicle.json @@ -7,7 +7,7 @@ "skill_used": "mechanics", "skills_required": [ "fabrication", 3 ], "difficulty": 5, - "time": 360000, + "time": "360 m", "book_learn": [ [ "textbook_fabrication", 6 ], [ "textbook_mechanics", 5 ] ], "using": [ [ "welding_standard", 10 ], [ "steel_standard", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], @@ -21,7 +21,7 @@ "skill_used": "mechanics", "skills_required": [ "fabrication", 2 ], "difficulty": 2, - "time": 60000, + "time": "60 m", "book_learn": [ [ "textbook_fabrication", 4 ], [ "textbook_mechanics", 2 ], [ "manual_mechanics", 2 ] ], "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -35,7 +35,7 @@ "skill_used": "mechanics", "skills_required": [ "fabrication", 2 ], "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -49,7 +49,7 @@ "skill_used": "mechanics", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": 2000, + "time": "2 m", "book_learn": [ [ "mag_fieldrepair", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 4 ], [ "leather_belt", 1 ], [ "rope_6", 1 ] ], [ [ "duct_tape", 20 ] ] ] @@ -62,7 +62,7 @@ "skill_used": "mechanics", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": 2000, + "time": "2 m", "book_learn": [ [ "mag_fieldrepair", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "bottle_plastic", 1 ] ], [ [ "paper", 50 ] ], [ [ "duct_tape", 20 ] ] ] @@ -75,7 +75,7 @@ "skill_used": "mechanics", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": 2000, + "time": "2 m", "book_learn": [ [ "mag_fieldrepair", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -92,7 +92,7 @@ "skill_used": "mechanics", "skills_required": [ "mechanics", 1 ], "difficulty": 1, - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal", 1 ], [ "steel_standard", 1, "LIST" ] ], [ [ "clockworks", 2 ], [ "lock", 1 ] ] ] @@ -105,7 +105,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "rope_natural", 4 ], [ "welding_standard", 12 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -120,7 +120,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "welding_standard", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -134,7 +134,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "rope_natural", 2 ], [ "welding_standard", 6 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -149,7 +149,7 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 4, "id_suffix": "repurpose_wire_basket", - "time": 25000, + "time": "25 m", "autolearn": true, "using": [ [ "welding_standard", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 7a6f94fd1d9d7..ef97a3405acfc 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 7 ], "difficulty": 8, - "time": 95000, + "time": "95 m", "book_learn": [ [ "recipe_lab_elec", 7 ], [ "recipe_mininuke_launch", 5 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], @@ -28,7 +28,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 7 ], "difficulty": 8, - "time": 95000, + "time": "95 m", "book_learn": [ [ "recipe_lab_elec", 10 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "plut_cell", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] @@ -41,7 +41,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 7 ], "difficulty": 8, - "time": 95000, + "time": "95 m", "book_learn": [ [ "recipe_lab_elec", 10 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "plut_slurry_dense", 5 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ] ] @@ -52,7 +52,7 @@ "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -65,7 +65,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", "difficulty": 1, - "time": 45000, + "time": "45 m", "autolearn": true, "tools": [ [ [ "brick_kiln", 10 ], [ "kiln", 10 ], [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 1 ] ] ] @@ -77,7 +77,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", "difficulty": 6, - "time": 60000, + "time": "60 m", "autolearn": true, "book_learn": [ [ "glassblowing_book", 5 ] ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ], @@ -91,7 +91,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 4 ], "difficulty": 2, - "time": 45000, + "time": "45 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 1 ] ], "tools": [ [ [ "press", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -115,7 +115,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 3, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "pocket_survival", 1 ], [ "book_archery", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -133,7 +133,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 2 ], "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "book_archery", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -148,7 +148,7 @@ "skills_required": [ [ "archery", 4 ], [ "survival", 1 ] ], "using": [ [ "forging_standard", 1 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "ANVIL", "level": 3 } ], @@ -169,7 +169,7 @@ "skills_required": [ [ "archery", 4 ], [ "survival", 1 ] ], "using": [ [ "forging_standard", 1 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "ANVIL", "level": 3 } ], @@ -190,7 +190,7 @@ "skills_required": [ [ "archery", 4 ], [ "survival", 1 ] ], "using": [ [ "forging_standard", 1 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "ANVIL", "level": 3 } ], @@ -210,7 +210,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 3 ], [ "survival", 1 ] ], "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ], @@ -228,7 +228,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 3 ], [ "archery", 1 ] ], "difficulty": 3, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "fire", -1 ] ] ], @@ -246,7 +246,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 3 ], [ "survival", 1 ] ], "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 2 ], [ "pocket_survival", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], @@ -275,7 +275,7 @@ "skills_required": [ [ "survival", 1 ] ], "using": [ [ "forging_standard", 1 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "ANVIL", "level": 3 } ], @@ -296,7 +296,7 @@ "skills_required": [ [ "survival", 1 ] ], "using": [ [ "forging_standard", 1 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "ANVIL", "level": 3 } ], @@ -317,7 +317,7 @@ "skills_required": [ [ "survival", 1 ] ], "using": [ [ "forging_standard", 1 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "ANVIL", "level": 3 } ], @@ -337,7 +337,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 1 ] ], "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ], @@ -355,7 +355,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 2 ], "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "book_archery", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -369,7 +369,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 3 ] ], "difficulty": 3, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "fire", -1 ] ] ], @@ -387,7 +387,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 3, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "pocket_survival", 1 ], [ "book_archery", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -405,7 +405,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 1 ] ], "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 2 ], [ "pocket_survival", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], @@ -433,7 +433,7 @@ "skill_used": "fabrication", "skills_required": [ "archery", 3 ], "difficulty": 3, - "time": 5000, + "time": "5 m", "reversible": true, "book_learn": [ [ "recipe_arrows", 5 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -465,7 +465,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 4 ] ], "difficulty": 4, - "time": 7000, + "time": "7 m", "reversible": true, "decomp_learn": 6, "note": "you just take the warhead off or put it on, rather than making the warhead", @@ -492,7 +492,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 5 ], [ "mechanics", 3 ] ], "difficulty": 6, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_anarch", 4 ], [ "recipe_bullets", 7 ] ], "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -517,7 +517,7 @@ "skill_used": "fabrication", "skills_required": [ [ "mechanics", 3 ] ], "difficulty": 5, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_arrows", 7 ], [ "textbook_anarch", 4 ], [ "recipe_bullets", 7 ] ], "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -541,7 +541,7 @@ "category": "CC_AMMO", "skill_used": "fabrication", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "bee_sting", 1 ] ], [ [ "scrap", 4 ] ] ] @@ -552,7 +552,7 @@ "category": "CC_AMMO", "skill_used": "fabrication", "difficulty": 4, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "steel_chunk", 3 ], [ "scrap", 8 ] ] ] @@ -565,7 +565,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 500, + "time": "0 m", "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -594,7 +594,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 500, + "time": "0 m", "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -612,7 +612,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 500, + "time": "0 m", "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -627,7 +627,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 3 ], "difficulty": 4, - "time": 45000, + "time": "45 m", "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "press", -1 ] ] ], @@ -644,7 +644,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 3 ], "difficulty": 4, - "time": 45000, + "time": "45 m", "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "press", -1 ] ] ], @@ -661,7 +661,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 3 ], "difficulty": 4, - "time": 45000, + "time": "45 m", "book_learn": [ [ "mag_rifle", 3 ], [ "recipe_bullets", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "press", -1 ] ] ], @@ -678,7 +678,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 3 ], "difficulty": 4, - "time": 45000, + "time": "45 m", "book_learn": [ [ "mag_rifle", 3 ], [ "recipe_bullets", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "press", -1 ] ] ], @@ -695,7 +695,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 3 ], "difficulty": 4, - "time": 45000, + "time": "45 m", "book_learn": [ [ "manual_shotgun", 3 ], [ "recipe_bullets", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "press", -1 ] ] ], @@ -712,7 +712,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 3 ], [ "survival", 1 ] ], "difficulty": 5, - "time": 56000, + "time": "56 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ], @@ -730,7 +730,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 5 ], "difficulty": 3, - "time": 10000, + "time": "10 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "recipe_lab_elec", 4 ] ], @@ -744,7 +744,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", "difficulty": 1, - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "rebar", 2 ] ] ] @@ -756,7 +756,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", "difficulty": 2, - "time": 100000, + "time": "100 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], @@ -770,7 +770,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 1 ], "difficulty": 2, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -783,7 +783,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "cooking", "difficulty": 7, - "time": 60000, + "time": "60 m", "qualities": [ { "id": "CHEM", "level": 2 } ], "book_learn": [ [ "textbook_gaswarfare", 8, "" ], @@ -806,7 +806,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", "difficulty": 3, - "time": 8000, + "time": "8 m", "book_learn": [ [ "manual_launcher", 4 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ], "tools": [ @@ -827,7 +827,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "book_learn": [ [ "manual_launcher", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ], "tools": [ [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ], @@ -840,7 +840,7 @@ "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", "difficulty": 5, - "time": 20000, + "time": "20 m", "book_learn": [ [ "manual_launcher", 6 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ], "tools": [ [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ], @@ -859,7 +859,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 4, - "time": 8000, + "time": "8 m", "book_learn": [ [ "textbook_gaswarfare", 4 ], [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], "qualities": [ { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -873,7 +873,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 3, - "time": 8000, + "time": "8 m", "book_learn": [ [ "textbook_gaswarfare", 3 ], [ "textbook_chemistry", 4 ], @@ -892,7 +892,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ diff --git a/data/json/recipes/recipe_companion.json b/data/json/recipes/recipe_companion.json index a806a67f3ec25..0810d5ff40de3 100644 --- a/data/json/recipes/recipe_companion.json +++ b/data/json/recipes/recipe_companion.json @@ -6,7 +6,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 300000, + "time": "300 m", "autolearn": false, "never_learn": true, "components": [ [ [ "log", 2 ], [ "stick", 16 ], [ "splinter", 80 ] ] ] @@ -19,7 +19,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": false, "never_learn": true, "using": [ [ "forging_standard", 1 ], [ "steel_standard", 6 ] ], @@ -34,7 +34,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 6, - "time": 52000, + "time": "52 m", "autolearn": false, "never_learn": true, "using": [ [ "forging_standard", 1 ], [ "steel_standard", 8 ] ], @@ -49,7 +49,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, - "time": 18000, + "time": "18 m", "autolearn": false, "never_learn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ], @@ -64,7 +64,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 3, - "time": 3000, + "time": "3 m", "autolearn": false, "never_learn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ], @@ -79,7 +79,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 4, - "time": 12000, + "time": "12 m", "autolearn": false, "never_learn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ], @@ -94,7 +94,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": 9000, + "time": "9 m", "autolearn": false, "never_learn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ], diff --git a/data/json/recipes/recipe_construction_om.json b/data/json/recipes/recipe_construction_om.json index 5fccd2db534a6..13e1c6a703088 100644 --- a/data/json/recipes/recipe_construction_om.json +++ b/data/json/recipes/recipe_construction_om.json @@ -8,7 +8,7 @@ "skill_used": "fabrication", "autolearn": false, "never_learn": true, - "time": 180000, + "time": "180 m", "construction_blueprint": "faction_base_field_camp_1", "components": [ [ [ "large_tent_kit", 1 ], [ "broketent", 4 ], [ "tent_kit", 3 ], [ "shelter_kit", 4 ] ] ] }, @@ -22,7 +22,7 @@ "difficulty": 1, "autolearn": false, "never_learn": true, - "time": 180000, + "time": "180 m", "construction_blueprint": "faction_base_field_camp_2", "qualities": [ [ { "id": "DIG", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ], "components": [ [ [ "2x4", 8 ] ], [ [ "straw_pile", 16 ], [ "pine_bough", 20 ] ] ] @@ -37,7 +37,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 180000, + "time": "180 m", "construction_blueprint": "faction_base_field_camp_3", "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ], "components": [ [ [ "2x4", 32 ] ], [ [ "nail", 96 ] ] ] @@ -52,7 +52,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 240000, + "time": "240 m", "construction_blueprint": "faction_base_field_camp_4", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -73,7 +73,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 720000, + "time": "720 m", "construction_blueprint": "faction_base_field_camp_5", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -96,7 +96,7 @@ "autolearn": false, "never_learn": true, "comment": "2hrs*14wall + 1 hr crates + 2*28roof + 4hrs pits = 89 hrs (12hrs on/off) 8 days total", - "time": 11520000, + "time": "11520 m", "construction_blueprint": "faction_base_field_camp_6", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 16 ] ], [ [ "log", 112 ] ], [ [ "nail", 48 ] ], [ [ "stick", 196 ] ] ] @@ -111,7 +111,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 720000, + "time": "720 m", "construction_blueprint": "faction_base_field_camp_7", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -134,7 +134,7 @@ "autolearn": false, "never_learn": true, "comment": "2hrs*4wall + .5 hr*2tables + .5hr*4benches+ 1hrs pits = 12 hrs (12hrs on/off) 1 days total", - "time": 1440000, + "time": "1440 m", "construction_blueprint": "faction_base_field_camp_8", "blueprint_provides": [ "fake_stove" ], "qualities": [ [ { "id": "DIG", "level": 1 } ], [ { "id": "SAW_M", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], @@ -157,7 +157,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 720000, + "time": "720 m", "construction_blueprint": "faction_base_field_camp_9", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -180,7 +180,7 @@ "autolearn": false, "never_learn": true, "comment": "2hrs*6wall + 1 hr trash + 2*20roof + 4hrs pits = 53 hrs (12hrs on/off) 4.5 days total", - "time": 6480000, + "time": "6480 m", "construction_blueprint": "faction_base_field_camp_10", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 64 ] ], [ [ "stick", 116 ] ], [ [ "sheet_metal", 2 ] ] ] @@ -196,7 +196,7 @@ "autolearn": false, "never_learn": true, "comment": "2hrs*5wall + 1.5 hr*2door + 2hrs pits = 15 hrs (12hrs on/off) 1 days total", - "time": 1440000, + "time": "1440 m", "construction_blueprint": "faction_base_field_camp_11", "qualities": [ [ { "id": "DIG", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 10 ] ], [ [ "stick", 15 ] ], [ [ "2x4", 32 ] ], [ [ "nail", 72 ] ] ] @@ -212,7 +212,7 @@ "autolearn": false, "never_learn": true, "comment": "11.5 hrs (12hrs on/off) 1 days total", - "time": 1440000, + "time": "1440 m", "construction_blueprint": "faction_base_field_camp_12", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "rock", 40 ] ], [ [ "pipe", 12 ] ], [ [ "2x4", 4 ] ], [ [ "well_pump", 1 ] ], [ [ "nail", 8 ] ] ] @@ -228,7 +228,7 @@ "autolearn": false, "never_learn": true, "comment": "2hrs*30palisade + .2hrs * 72pits = 75 hrs (12hrs on/off) 6.5 days total", - "time": 9360000, + "time": "9360 m", "construction_blueprint": "faction_base_field_camp_13", "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "log", 90 ] ], [ [ "rope_makeshift_6", 60 ], [ "rope_6", 60 ], [ "vine_30", 30 ] ] ] @@ -245,7 +245,7 @@ "never_learn": true, "comment": "2hrs*56palisade + .2hrs * 14pits = 115 hrs (12hrs on/off) 10 days total", "construction_blueprint": "faction_base_field_camp_14", - "time": 14400000, + "time": "14400 m", "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "log", 168 ] ], [ [ "rope_makeshift_6", 112 ], [ "rope_6", 112 ], [ "vine_30", 112 ] ] ] }, @@ -259,7 +259,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 720000, + "time": "720 m", "construction_blueprint": "faction_base_field_camp_15", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -282,7 +282,7 @@ "autolearn": false, "never_learn": true, "comment": "1hr stove+ .5 hr*2tables + .5hr*4benches+ .5hrs 2counter = 5 hrs ", - "time": 370000, + "time": "370 m", "construction_blueprint": "faction_base_field_camp_16", "qualities": [ [ { "id": "DIG", "level": 1 } ], [ { "id": "SAW_M", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 40 ] ], [ [ "nail", 72 ] ], [ [ "metal_tank", 1 ] ], [ [ "pipe", 1 ] ] ] @@ -298,7 +298,7 @@ "autolearn": false, "never_learn": true, "comment": "3*7doors = 21 hrs so 2 days-ish ", - "time": 2880000, + "time": "2880 m", "construction_blueprint": "faction_base_field_camp_17", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 198 ] ], [ [ "nail", 588 ] ] ] @@ -313,7 +313,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 720000, + "time": "720 m", "construction_blueprint": "faction_base_field_camp_18", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -335,7 +335,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 2880000, + "time": "2880 m", "construction_blueprint": "faction_base_field_camp_19", "qualities": [ { "id": "HAMMER", "level": 2 }, @@ -368,7 +368,7 @@ "difficulty": 6, "autolearn": false, "never_learn": true, - "time": 2880000, + "time": "2880 m", "construction_blueprint": "faction_base_field_camp_20", "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ @@ -394,7 +394,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "faction_base_field_camp_farm_0", - "time": 180000 + "time": "180 m" }, { "type": "recipe", @@ -405,7 +405,7 @@ "skill_used": "fabrication", "autolearn": false, "never_learn": true, - "time": 540000, + "time": "540 m", "construction_blueprint": "faction_base_field_camp_farm_1", "qualities": [ [ { "id": "DIG", "level": 1 } ] ] }, @@ -419,7 +419,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 3600000, + "time": "3600 m", "construction_blueprint": "faction_base_field_camp_farm_2", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 54 ] ], [ [ "stick", 90 ] ] ] @@ -434,7 +434,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 2160000, + "time": "2160 m", "construction_blueprint": "faction_base_field_camp_farm_3", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 24 ] ], [ [ "stick", 36 ] ], [ [ "2x4", 16 ] ], [ [ "nail", 36 ] ] ] @@ -450,7 +450,7 @@ "autolearn": false, "never_learn": true, "comment": "1hrs*26wall + 1.5 hr*1door + 0.5hrs*14pits + 2hrs*2window + 2hrs*20log roof + 0.5hrs*9counter + 0.5hrs*1table = 83.5 hrs (12hrs on/off) 7 days total; requires 26wall*(2log+3stick+6 2x4 ) + 1door*(16 2x4+36nail) + 2windows*(15 2x4+30nail+2log+glass) + 20roof*(2log+4stick+8 2x4) + 1table*(8nail+6 2x4) + 9counter*(8nail+6 2x4)", - "time": 10080000, + "time": "10080 m", "construction_blueprint": "faction_base_field_camp_farm_4", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 96 ] ], [ [ "stick", 158 ] ], [ [ "2x4", 336 ] ], [ [ "nail", 176 ] ], [ [ "glass_sheet", 2 ] ] ] @@ -465,7 +465,7 @@ "autolearn": false, "construction_blueprint": "faction_base_field_camp_garage_0", "never_learn": true, - "time": 180000 + "time": "180 m" }, { "type": "recipe", @@ -479,7 +479,7 @@ "never_learn": true, "construction_blueprint": "faction_base_field_camp_garage_1", "blueprint_provides": [ "wrench", "hacksaw" ], - "time": 5040000, + "time": "5040 m", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "log", 72 ] ], @@ -503,7 +503,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "faction_base_field_camp_garage_2", - "time": 4320000, + "time": "4320 m", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 68 ] ], [ [ "stick", 60 ] ], [ [ "2x4", 112 ] ] ] }, @@ -517,7 +517,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 10080000, + "time": "10080 m", "construction_blueprint": "faction_base_field_camp_garage_3", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 112 ] ], [ [ "2x4", 448 ] ] ] @@ -532,7 +532,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 4320000, + "time": "4320 m", "construction_blueprint": "faction_base_field_camp_garage_4", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 65 ] ], [ [ "stick", 96 ] ] ] @@ -547,7 +547,7 @@ "difficulty": 5, "autolearn": false, "never_learn": true, - "time": 11520000, + "time": "11520 m", "construction_blueprint": "faction_base_field_camp_garage_5", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ @@ -569,7 +569,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 2880000, + "time": "2880 m", "construction_blueprint": "faction_base_field_camp_garage_6", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], "components": [ @@ -592,7 +592,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "faction_base_field_camp_kitchen_0", - "time": 180000 + "time": "180 m" }, { "type": "recipe", @@ -606,7 +606,7 @@ "never_learn": true, "construction_blueprint": "faction_base_field_camp_kitchen_1", "blueprint_provides": [ "fake_fireplace" ], - "time": 7200000, + "time": "7200 m", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "pot", 1 ], [ "rock_pot", 1 ], [ "pot_copper", 1 ], [ "clay_pot", 1 ] ], @@ -627,7 +627,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 3600000, + "time": "3600 m", "construction_blueprint": "faction_base_field_camp_kitchen_2", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -649,7 +649,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 3600000, + "time": "3600 m", "construction_blueprint": "faction_base_field_camp_kitchen_3", "blueprint_provides": [ "fake_char_smoker" ], "qualities": [ @@ -677,7 +677,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 9360000, + "time": "9360 m", "construction_blueprint": "faction_base_field_camp_kitchen_4", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -699,7 +699,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 360000, + "time": "360 m", "construction_blueprint": "faction_base_field_camp_kitchen_5", "blueprint_provides": [ "fake_fireplace", "fake_char_smoker", "fake_char_smoker" ], "qualities": [ @@ -721,7 +721,7 @@ "difficulty": 5, "autolearn": false, "never_learn": true, - "time": 1440000, + "time": "1440 m", "construction_blueprint": "faction_base_field_camp_kitchen_6", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -744,7 +744,7 @@ "difficulty": 5, "autolearn": false, "never_learn": true, - "time": 180000, + "time": "180 m", "construction_blueprint": "faction_base_field_camp_kitchen_7", "blueprint_provides": [ "fake_stove", "fake_stove" ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], @@ -760,7 +760,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 3600000, + "time": "3600 m", "construction_blueprint": "faction_base_field_camp_kitchen_8", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 40 ] ], [ [ "stick", 30 ] ], [ [ "2x4", 135 ] ], [ [ "nail", 150 ] ], [ [ "glass_sheet", 1 ] ] ] @@ -775,7 +775,7 @@ "difficulty": 1, "autolearn": false, "never_learn": true, - "time": 510000, + "time": "510 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "components": [ [ [ "stick", 3 ] ] ] }, @@ -789,7 +789,7 @@ "difficulty": 2, "autolearn": false, "never_learn": true, - "time": 1530000, + "time": "1530 m", "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "pointy_stick", 68 ] ] ] }, @@ -803,7 +803,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "faction_base_field_camp_blacksmith_0", - "time": 180000 + "time": "180 m" }, { "type": "recipe", @@ -815,7 +815,7 @@ "difficulty": 5, "autolearn": false, "never_learn": true, - "time": 180000, + "time": "180 m", "construction_blueprint": "faction_base_field_camp_blacksmith_1", "blueprint_provides": [ "fake_rforge", "fake_char_kiln", "makeshift_hammer" ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], @@ -835,7 +835,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 10080000, + "time": "10080 m", "construction_blueprint": "faction_base_field_camp_blacksmith_2", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 136 ] ], [ [ "stick", 72 ] ], [ [ "2x4", 352 ] ] ] @@ -850,7 +850,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 180000, + "time": "180 m", "construction_blueprint": "faction_base_field_camp_blacksmith_3", "blueprint_provides": [ "anvil", "crucible" ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], @@ -872,7 +872,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 8640000, + "time": "8640 m", "construction_blueprint": "faction_base_field_camp_blacksmith_4", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "log", 108 ] ], [ [ "stick", 36 ] ], [ [ "2x4", 342 ] ], [ [ "nail", 8 ] ] ] @@ -887,7 +887,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 180000, + "time": "180 m", "construction_blueprint": "faction_base_field_camp_blacksmith_5", "blueprint_provides": [ "tongs", "chisel", "hammer", "swage" ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], @@ -911,7 +911,7 @@ "difficulty": 5, "autolearn": false, "never_learn": true, - "time": 480000, + "time": "480 m", "construction_blueprint": "faction_base_field_camp_blacksmith_6", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "hammer", 1 ] ], [ [ "2x4", 16 ] ], [ [ "nail", 48 ] ], [ [ "rock", 120 ] ] ] @@ -927,7 +927,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "faction_base_field_camp_blacksmith_7", - "time": 1440000, + "time": "1440 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 40 ] ], @@ -951,7 +951,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 10080000, + "time": "10080 m", "construction_blueprint": "faction_base_field_camp_blacksmith_8", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ @@ -974,7 +974,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 360000, + "time": "360 m", "construction_blueprint": "faction_base_field_camp_blacksmith_9", "blueprint_provides": [ "wrench", "pliers" ], "qualities": [ [ { "id": "WRENCH", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], @@ -999,7 +999,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 8640000, + "time": "8640 m", "construction_blueprint": "faction_base_field_camp_blacksmith_10", "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "log", 104 ] ], [ [ "stick", 54 ] ], [ [ "2x4", 272 ] ] ] @@ -1014,7 +1014,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 1440000, + "time": "1440 m", "construction_blueprint": "faction_base_field_camp_blacksmith_11", "qualities": [ [ { "id": "WRENCH", "level": 1 } ], [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "well_pump", 1 ] ], [ [ "pipe", 6 ] ], [ [ "2x4", 16 ] ], [ [ "nail", 24 ] ], [ [ "rock", 40 ] ] ] @@ -1029,7 +1029,7 @@ "difficulty": 4, "autolearn": false, "never_learn": true, - "time": 4320000, + "time": "4320 m", "construction_blueprint": "faction_base_field_camp_blacksmith_12", "blueprint_provides": [ "fake_drop_hammer" ], "qualities": [ [ { "id": "WRENCH", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ], diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 026737b17727f..7357da5b854e9 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -2,69 +2,69 @@ { "result": "alarmclock", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 4 ] ], [ [ "clockworks", 2 ] ] ] }, { "result": "badge_cybercop", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 20 ] ] ] }, { "result": "badge_deputy", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 20 ] ] ] }, { "result": "badge_detective", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 20 ] ] ] }, { "result": "badge_marshal", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 20 ] ] ] }, { "result": "badge_swat", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 20 ] ] ] }, { "result": "baseball", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "leather", 2 ] ], [ [ "string_6", 2 ] ] ] }, { "result": "battletorch_done", "type": "uncraft", - "time": 2000, + "time": "2 m", "components": [ [ [ "bat", 1 ] ], [ [ "nomex", 5 ] ] ] }, { "result": "bindle", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "rag", 4 ] ], [ [ "stick", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "binoculars", "type": "uncraft", - "time": 1200, + "time": "1 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "lens", 2 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "scrap", 1 ] ] ] }, @@ -74,7 +74,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "firstaid", 5 ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] @@ -85,7 +85,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "firstaid", 5 ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] @@ -96,7 +96,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "firstaid", 5 ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] @@ -107,7 +107,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "firstaid", 5 ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] @@ -118,7 +118,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "firstaid", 5 ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] @@ -129,7 +129,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "firstaid", 5 ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] @@ -140,7 +140,7 @@ "skill_used": "electronics", "difficulty": 7, "skills_required": [ "firstaid", 5 ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] @@ -148,7 +148,7 @@ { "result": "blade", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 3 ] ] ] }, @@ -156,21 +156,21 @@ "result": "boots_steel", "type": "uncraft", "skill_used": "tailor", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "leather", 8 ] ], [ [ "scrap", 2 ] ] ] }, { "result": "bowl_pewter", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "tin", 100 ] ] ] }, { "result": "box_cigarette", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "paper", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -179,7 +179,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "time": 2000, + "time": "2 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -197,7 +197,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "time": 2000, + "time": "2 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -215,7 +215,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 6, - "time": 120000, + "time": "120 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -237,7 +237,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 6, - "time": 120000, + "time": "120 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -254,7 +254,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 2, - "time": 30000, + "time": "30 m", "using": [ [ "soldering_standard", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -273,7 +273,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "time": 2000, + "time": "2 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -291,7 +291,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "time": 2000, + "time": "2 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -309,7 +309,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "time": 2000, + "time": "2 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -327,7 +327,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "time": 2000, + "time": "2 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -346,7 +346,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 4000, + "time": "4 m", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -364,7 +364,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 3, - "time": 180000, + "time": "180 m", "using": [ [ "welding_standard", 6 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ @@ -382,7 +382,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 6, - "time": 120000, + "time": "120 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -404,7 +404,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 3, - "time": 60000, + "time": "60 m", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -426,7 +426,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 120000, + "time": "120 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "WRENCH", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ @@ -450,7 +450,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 8, - "time": 600000, + "time": "600 m", "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -477,7 +477,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 8, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -500,7 +500,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 6, - "time": 150000, + "time": "150 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -521,7 +521,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 6, - "time": 150000, + "time": "150 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -542,7 +542,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 60000, + "time": "60 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "WRENCH", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -566,7 +566,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 60000, + "time": "60 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "WRENCH", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -590,7 +590,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 4 ] ], [ [ "power_supply", 1 ] ], [ [ "e_scrap", 6 ] ], [ [ "solder_wire", 1 ] ] ] }, @@ -599,7 +599,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 4 ] ], [ [ "power_supply", 1 ] ], [ [ "e_scrap", 6 ] ], [ [ "solder_wire", 1 ] ] ] }, @@ -608,7 +608,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 4 ] ], [ [ "power_supply", 1 ] ], [ [ "e_scrap", 6 ] ], [ [ "solder_wire", 1 ] ] ] }, @@ -617,7 +617,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 4 ] ], [ [ "RAM", 10 ] ], [ [ "power_supply", 1 ] ], [ [ "e_scrap", 6 ] ], [ [ "solder_wire", 1 ] ] ] }, @@ -626,7 +626,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 4 ] ], @@ -642,7 +642,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 4 ] ], @@ -657,7 +657,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 10 ] ], @@ -673,7 +673,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 5 ] ], @@ -689,7 +689,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 20 ] ], "components": [ [ [ "processor", 15 ] ], @@ -705,7 +705,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 5, - "time": 300000, + "time": "300 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -721,7 +721,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 4, - "time": 400000, + "time": "400 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -737,7 +737,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 4, - "time": 400000, + "time": "400 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "motor_tiny", 24 ] ], [ [ "power_supply", 8 ] ], [ [ "cable", 16 ] ], [ [ "scrap", 14 ] ] ] @@ -747,7 +747,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 4, - "time": 400000, + "time": "400 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "motor_small", 6 ] ], [ [ "power_supply", 6 ] ], [ [ "cable", 12 ] ], [ [ "steel_chunk", 6 ] ] ] @@ -757,7 +757,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 4, - "time": 400000, + "time": "400 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -773,7 +773,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "time": 200000, + "time": "200 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -789,7 +789,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 5, - "time": 400000, + "time": "400 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ @@ -807,7 +807,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 5, - "time": 400000, + "time": "400 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ @@ -825,7 +825,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 4, - "time": 400000, + "time": "400 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "motor", 2 ] ], [ [ "power_supply", 6 ] ], [ [ "cable", 4 ] ], [ [ "steel_lump", 6 ] ], [ [ "steel_chunk", 6 ] ] ] @@ -833,7 +833,7 @@ { "result": "cable", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "copper", 1 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -841,28 +841,28 @@ { "result": "camera", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 2 ] ], [ [ "processor", 1 ] ], [ [ "plastic_chunk", 5 ] ], [ [ "e_scrap", 2 ] ], [ [ "lens", 1 ] ] ] }, { "result": "camera_pro", "type": "uncraft", - "time": 1200, + "time": "1 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 5 ] ], [ [ "processor", 1 ] ], [ [ "plastic_chunk", 10 ] ], [ [ "e_scrap", 8 ] ], [ [ "lens", 2 ] ] ] }, { "result": "candlestick", "type": "uncraft", - "time": 2000, + "time": "2 m", "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "gold_small", 300 ] ] ] }, { "result": "cannabis", "type": "uncraft", - "time": 5000, + "time": "5 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "weed", 20 ] ], [ [ "plant_fibre", 100 ] ], [ [ "withered", 1 ] ] ], "flags": [ "BLIND_HARD" ] @@ -870,73 +870,73 @@ { "result": "cell_phone", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "small_lcd_screen", 1 ] ], [ [ "RAM", 1 ] ], [ [ "processor", 1 ] ] ] }, { "result": "smart_phone", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "small_lcd_screen", 1 ] ], [ [ "RAM", 1 ] ], [ [ "processor", 1 ] ], [ [ "lens_small", 1 ] ] ] }, { "result": "ceramic_bowl", "type": "uncraft", - "time": 1000, + "time": "1 m", "components": [ [ [ "ceramic_shard", 1 ] ] ] }, { "result": "ceramic_cup", "type": "uncraft", - "time": 1000, + "time": "1 m", "components": [ [ [ "ceramic_shard", 1 ] ] ] }, { "result": "ceramic_plate", "type": "uncraft", - "time": 1000, + "time": "1 m", "components": [ [ [ "ceramic_shard", 1 ] ] ] }, { "result": "char_purifier", "type": "uncraft", - "time": 10000, + "time": "10 m", "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ] ] }, { "result": "clock", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 3 ] ], [ [ "clockworks", 2 ] ] ] }, { "result": "copper_bracelet", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "copper", 43 ] ] ] }, { "result": "copper_ear", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "copper", 25 ] ] ] }, { "result": "creepy_doll", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "rag", 2 ] ], [ [ "RAM", 1 ] ], [ [ "e_scrap", 2 ] ] ] }, { "result": "crown_golden", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 200 ] ] ] }, @@ -948,7 +948,7 @@ { "result": "cu_pipe", "type": "uncraft", - "time": 1200, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "copper", 200 ] ] ] @@ -956,35 +956,35 @@ { "result": "diamond_dental_grill", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 2 ] ], [ [ "diamond", 1 ] ] ] }, { "result": "diamond_ring", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 2 ] ], [ [ "diamond", 1 ] ] ] }, { "result": "down_blanket", "type": "uncraft", - "time": 2000, + "time": "2 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 35 ] ], [ [ "down_feather", 160 ] ] ] }, { "result": "down_pillow", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 6 ] ], [ [ "down_feather", 40 ] ] ] }, { "result": "eink_tablet_pc", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "RAM", 1 ] ], [ [ "processor", 1 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "e_scrap", 2 ] ] ] }, @@ -993,108 +993,108 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 500, + "time": "0 m", "qualities": [ { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "scrap", 3 ] ], [ [ "hose", 1 ] ], [ [ "jerrycan_big", 1 ] ] ] }, { "result": "fan", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 3 ] ], [ [ "motor_micro", 1 ] ], [ [ "cable", 2 ] ] ] }, { "result": "fancy_sunglasses", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "glass_tinted", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "felt_patch", "type": "uncraft", - "time": 6000, + "time": "6 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "yarn", 50 ] ] ] }, { "result": "file", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "paper", 3 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "fitover_sunglasses", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "glass_tinted", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "flyer", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "paper", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "scorecard", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "paper", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "foon", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ] ] }, { "result": "football", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "leather", 4 ] ], [ [ "string_6", 3 ] ] ] }, { "result": "fork", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ] ] }, { "result": "glass", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "glass_shard", 1 ] ] ] }, { "result": "glass_bowl", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "glass_shard", 1 ] ] ] }, { "result": "glass_plate", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "glass_shard", 1 ] ] ] }, { "result": "glass_sheet", "type": "uncraft", - "time": 2000, + "time": "2 m", "components": [ [ [ "glass_shard", 12 ] ] ] }, { "result": "gobag", "type": "uncraft", - "time": 2000, + "time": "2 m", "components": [ [ [ "duffelbag", 1 ] ], [ [ "backpack", 1 ] ], @@ -1128,28 +1128,28 @@ { "result": "gold_bracelet", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 8 ] ] ] }, { "result": "gold_dental_grill", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 2 ] ] ] }, { "result": "gold_ear", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 2 ] ] ] }, { "result": "gold_watch", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "gold_small", 12 ] ], [ [ "clockworks", 1 ] ] ] }, @@ -1158,7 +1158,7 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 4, - "time": 750000, + "time": "750 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], "tools": [ [ [ "welder", 500 ], [ "toolset", 750 ] ] ], "components": [ [ [ "steel_plate", 10 ] ], [ [ "steel_lump", 70 ] ] ] @@ -1168,7 +1168,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 3, - "time": 10000, + "time": "10 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "cable", 12 ] ], [ [ "amplifier", 2 ] ], [ [ "material_aluminium_ingot", 1 ] ] ] }, @@ -1177,7 +1177,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 3, - "time": 10000, + "time": "10 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "e_scrap", 4 ] ], [ [ "amplifier", 2 ] ], [ [ "scrap", 4 ] ] ] }, @@ -1186,7 +1186,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 2, - "time": 10000, + "time": "10 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "e_scrap", 2 ] ], [ [ "amplifier", 1 ] ], [ [ "scrap", 2 ] ] ] }, @@ -1195,20 +1195,20 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "components": [ [ [ "charcoal", 200 ] ], [ [ "char_kiln", 1 ] ] ] }, { "result": "knife_steak", "type": "uncraft", - "time": 2000, + "time": "2 m", "components": [ [ [ "spike", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "l_HFPack", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "l_long_45", 1 ] ], [ [ "l_enforcer_45", 1 ] ], @@ -1222,7 +1222,7 @@ "result": "laptop", "type": "uncraft", "skill_used": "electronics", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 1 ] ], @@ -1237,14 +1237,14 @@ { "result": "basket_laundry", "type": "uncraft", - "time": 5000, + "time": "5 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "plastic_chunk", 20 ] ] ] }, { "result": "lawnmower", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "scrap", 8 ] ], @@ -1258,13 +1258,13 @@ { "result": "lighter", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "pilot_light", 1 ] ], [ [ "plastic_chunk", 1 ] ] ] }, { "result": "locket", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 10 ] ] ] }, @@ -1272,28 +1272,28 @@ "result": "makeshift_crowbar", "type": "uncraft", "skill_used": "mechanics", - "time": 5000, + "time": "5 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "scrap", 3 ] ], [ [ "steel_chunk", 1 ] ] ] }, { "result": "makeshift_sling", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "sheet", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "many_years_old_newspaper", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "material_shrd_limestone", "type": "uncraft", - "time": 10000, + "time": "10 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ [ [ "material_limestone", 10 ] ] ] @@ -1302,7 +1302,7 @@ "result": "mess_kit", "type": "uncraft", "skill_used": "electronics", - "time": 10000, + "time": "10 m", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "element", 3 ] ], [ [ "amplifier", 1 ] ], [ [ "scrap", 6 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "cable", 8 ] ] ] @@ -1311,7 +1311,7 @@ "result": "microwave", "type": "uncraft", "skill_used": "electronics", - "time": 80000, + "time": "80 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 1 ] ], @@ -1326,28 +1326,28 @@ "result": "mil_mess_kit", "type": "uncraft", "skill_used": "electronics", - "time": 10000, + "time": "10 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "element", 3 ] ], [ [ "amplifier", 1 ] ], [ [ "cable", 8 ] ] ] }, { "result": "militarymap", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 10 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "money_bundle", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "months_old_newspaper", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -1356,7 +1356,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 4, - "time": 30000, + "time": "30 m", "using": [ [ "soldering_standard", 40 ], [ "welding_standard", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "amplifier", 2 ] ], [ [ "cable", 20 ] ], [ [ "bearing", 20 ] ], [ [ "steel_chunk", 3 ] ] ] @@ -1366,7 +1366,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 6, - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 50 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ @@ -1381,7 +1381,7 @@ "result": "multi_cooker", "type": "uncraft", "skill_used": "electronics", - "time": 90000, + "time": "90 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 1 ] ], @@ -1398,21 +1398,21 @@ { "result": "necklace", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 10 ] ] ] }, { "result": "newest_newspaper", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "one_year_old_newspaper", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -1421,7 +1421,7 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 2, - "time": 1500, + "time": "1 m", "qualities": [ { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "scrap", 5 ] ], [ [ "cu_pipe", 1 ] ], [ [ "pilot_light", 1 ] ], [ [ "rag", 5 ] ], [ [ "metal_tank_little", 2 ] ] ] }, @@ -1430,14 +1430,14 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 500, + "time": "0 m", "qualities": [ { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "metal_tank_little", 1 ] ] ] }, { "result": "pillow", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 4 ] ], [ [ "cotton_ball", 8 ] ] ] }, @@ -1445,14 +1445,14 @@ "result": "pipe", "type": "uncraft", "skill_used": "mechanics", - "time": 5000, + "time": "5 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "scrap", 7 ] ] ] }, { "result": "pocketwatch", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "gold_small", 3 ] ], [ [ "clockworks", 1 ] ] ] }, @@ -1461,7 +1461,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 2, - "time": 10000, + "time": "10 m", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "motor_small", 1 ] ], [ [ "scrap", 4 ] ] ] @@ -1471,7 +1471,7 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 7500, + "time": "7 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "scrap_copper", 5 ] ], [ [ "scrap", 1 ] ] ] }, @@ -1481,7 +1481,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required": [ "electronics", 5 ], - "time": 80000, + "time": "80 m", "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ @@ -1499,7 +1499,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required": [ "electronics", 4 ], - "time": 80000, + "time": "80 m", "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ @@ -1516,7 +1516,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 1, - "time": 10000, + "time": "10 m", "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "e_scrap", 3 ] ], [ [ "plastic_chunk", 1 ] ] ] @@ -1525,7 +1525,7 @@ "result": "radio_car", "type": "uncraft", "skill_used": "electronics", - "time": 7000, + "time": "7 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "antenna", 1 ] ], @@ -1540,55 +1540,55 @@ { "result": "radio_car_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "radio_car", 1 ] ], [ [ "radiocontrol", 1 ] ], [ [ "light_battery_cell", 2 ] ] ] }, { "result": "radiocontrol", "type": "uncraft", "skill_used": "electronics", - "time": 3000, + "time": "3 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "antenna", 1 ] ], [ [ "e_scrap", 2 ] ], [ [ "transponder", 1 ] ], [ [ "plastic_chunk", 1 ] ] ] }, { "result": "rag", "type": "uncraft", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "thread", 80 ] ] ] }, { "result": "stick_fiber", "type": "uncraft", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "plant_fibre", 80 ] ] ] }, { "result": "ref_lighter", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "pilot_light", 1 ] ], [ [ "scrap", 1 ] ] ] }, { "result": "restaurantmap", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 10 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "ring", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 2 ] ] ] }, { "result": "roadmap", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 10 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -1597,7 +1597,7 @@ "type": "uncraft", "skill_used": "mechanics", "difficulty": 3, - "time": 10000, + "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 ] ] ] @@ -1607,7 +1607,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 8, - "time": 60000, + "time": "60 m", "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 ] ] ] @@ -1615,14 +1615,14 @@ { "result": "scythe", "type": "uncraft", - "time": 10000, + "time": "10 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "blade_scythe", 1 ] ], [ [ "stick_long", 1 ] ] ] }, { "result": "seat", "type": "uncraft", - "time": 5000, + "time": "5 m", "using": [ [ "welding_standard", 6 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "pipe", 4 ] ], [ [ "spring", 2 ] ], [ [ "leather", 12 ] ] ] @@ -1630,21 +1630,21 @@ { "result": "sf_watch", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "gold_small", 5 ] ], [ [ "silver_small", 12 ] ], [ [ "clockworks", 1 ] ] ] }, { "result": "silver_bracelet", "type": "uncraft", - "time": 600, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 10 ] ] ] }, { "result": "silver_ear", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 3 ] ] ] }, @@ -1653,14 +1653,14 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 500, + "time": "0 m", "qualities": [ { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "metal_tank_little", 1 ] ] ] }, { "result": "small_relic", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 20 ] ] ] }, @@ -1669,98 +1669,98 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 500, + "time": "0 m", "qualities": [ { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "canister_empty", 1 ] ] ] }, { "result": "spoon", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ] ] }, { "result": "spork", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ] ] }, { "result": "spring", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 7 ] ] ] }, { "result": "stick_long", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 2 ] ] ] }, { "result": "straw_basket", "type": "uncraft", - "time": 2000, + "time": "2 m", "components": [ [ [ "straw_pile", 4 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "straw_doll", "type": "uncraft", - "time": 1000, + "time": "1 m", "components": [ [ [ "straw_pile", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "straw_fedora", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "straw_pile", 5 ] ] ] }, { "result": "straw_hat", "type": "uncraft", - "time": 1500, + "time": "1 m", "components": [ [ [ "straw_pile", 2 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "straw_sandals", "type": "uncraft", - "time": 2000, + "time": "2 m", "components": [ [ [ "straw_pile", 2 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "sunglasses", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "glass_tinted", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "survivormap", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 10 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "survnote", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "paper", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "talking_doll", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "rag", 2 ] ], [ [ "RAM", 1 ] ], [ [ "e_scrap", 2 ] ] ] }, @@ -1768,7 +1768,7 @@ "result": "tank_top", "type": "uncraft", "skill_used": "tailor", - "time": 500, + "time": "0 m", "components": [ [ [ "rag", 4 ] ] ], "flags": [ "BLIND_HARD" ] }, @@ -1776,7 +1776,7 @@ "result": "television", "type": "uncraft", "skill_used": "electronics", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 1 ] ], @@ -1790,21 +1790,21 @@ { "result": "thyme", "type": "uncraft", - "time": 1000, + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "wild_herbs", 10 ] ] ] }, { "result": "tieclip", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 4 ] ] ] }, { "result": "tin_plate", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "tin", 100 ] ] ] }, @@ -1812,14 +1812,14 @@ "result": "toaster", "type": "uncraft", "skill_used": "electronics", - "time": 10000, + "time": "10 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "cable", 2 ] ], [ [ "power_supply", 1 ] ], [ [ "scrap", 2 ] ], [ [ "element", 4 ] ] ] }, { "result": "touristmap", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 10 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -1827,21 +1827,21 @@ "result": "tshirt", "type": "uncraft", "skill_used": "tailor", - "time": 500, + "time": "0 m", "components": [ [ [ "rag", 5 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "usb_drive", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "RAM", 1 ] ] ] }, { "result": "vac_sealer", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 4 ] ], [ [ "element", 2 ] ], [ [ "hose", 1 ] ], [ [ "power_supply", 1 ] ] ] }, @@ -1851,42 +1851,42 @@ "skill_used": "electronics", "difficulty": 3, "skills_required": [ "fabrication", 2 ], - "time": 5400, + "time": "5 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "e_scrap", 1 ] ], [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 1 ] ] ] }, { "result": "weeks_old_newspaper", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "wire", "type": "uncraft", - "time": 1500, + "time": "1 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ] ] }, { "result": "wrapper", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "wristwatch", "type": "uncraft", - "time": 500, + "time": "0 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "plastic_chunk", 1 ] ], [ [ "processor", 1 ] ], [ [ "light_minus_battery_cell", 1 ] ] ] }, { "result": "years_old_newspaper", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -1895,7 +1895,7 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 4, - "time": 9000, + "time": "9 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1, "amount": 1 }, { "id": "HAMMER", "level": 3, "amount": 1 } ], "components": [ [ [ "scrap", 4 ] ], [ [ "cable", 2 ] ], [ [ "pot", 1 ] ], [ [ "e_scrap", 1 ] ], [ [ "motor_micro", 1 ] ] ] @@ -1903,7 +1903,7 @@ { "result": "box_small", "type": "uncraft", - "time": 2050, + "time": "2 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "paper", 35 ] ] ] }, @@ -1911,7 +1911,7 @@ "result": "washing_machine", "type": "uncraft", "skill_used": "electronics", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "cable", 8 ] ], @@ -1932,7 +1932,7 @@ "skill_used": "electronics", "difficulty": 8, "skills_required": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 35 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ], "components": [ @@ -1954,7 +1954,7 @@ "skill_used": "electronics", "difficulty": 8, "skills_required": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 35 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ], "components": [ @@ -1976,7 +1976,7 @@ "skill_used": "electronics", "difficulty": 10, "skills_required": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 35 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ], "components": [ @@ -1998,7 +1998,7 @@ "skill_used": "electronics", "difficulty": 10, "skills_required": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 35 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ], "components": [ @@ -2040,7 +2040,7 @@ { "result": "1st_aid", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "medical_tape", 20 ] ], [ [ "aspirin", 10 ] ], @@ -2055,21 +2055,21 @@ { "result": "garlic", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "garlic_clove", 6 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "leaf_spring", "type": "uncraft", - "time": 3000, + "time": "3 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "steel_lump", 4 ] ] ] }, { "result": "styrofoam_cup", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "paper", 10 ] ], [ [ "plastic_chunk", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -2078,7 +2078,7 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 4000, + "time": "4 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 20 ], [ "steel_chunk", 2 ] ] ] }, @@ -2087,21 +2087,21 @@ "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, - "time": 800, + "time": "0 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "scrap", 7 ] ], [ [ "steel_chunk", 1 ] ], [ [ "platinum_small", 8 ] ], [ [ "pipe", 2 ] ] ] }, { "result": "fluid_preserved_brain", "type": "uncraft", - "time": 100, + "time": "0 m", "components": [ [ [ "chem_formaldehyde", 10 ] ], [ [ "human_brain_embalmed", 5 ] ], [ [ "jar_3l_glass", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "trailmap", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "paper", 10 ] ] ], "flags": [ "BLIND_EASY" ] }, @@ -2111,7 +2111,7 @@ "skill_used": "electronics", "difficulty": 4, "skills_required": [ "cooking", 1 ], - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "using": [ [ "soldering_standard", 20 ] ], "components": [ @@ -2129,7 +2129,7 @@ "result": "melting_point", "type": "uncraft", "skill_used": "electronics", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "using": [ [ "soldering_standard", 5 ] ], "components": [ @@ -2145,7 +2145,7 @@ "result": "vortex", "type": "uncraft", "skill_used": "electronics", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "using": [ [ "soldering_standard", 5 ] ], "components": [ @@ -2161,7 +2161,7 @@ "result": "ph_meter", "type": "uncraft", "skill_used": "electronics", - "time": 5000, + "time": "5 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "voltmeter", 1 ] ], [ [ "glass_tube_small", 2 ] ] ] }, @@ -2169,7 +2169,7 @@ "result": "voltmeter", "type": "uncraft", "skill_used": "electronics", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 2 ] ], [ [ "amplifier", 1 ] ], [ [ "cable", 6 ] ], [ [ "plastic_chunk", 4 ] ], [ [ "e_scrap", 3 ] ] ] }, @@ -2177,7 +2177,7 @@ "result": "microscope", "type": "uncraft", "skill_used": "fabrication", - "time": 45000, + "time": "45 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "steel_lump", 2 ] ], @@ -2194,7 +2194,7 @@ "result": "microscope_dissecting", "type": "uncraft", "skill_used": "fabrication", - "time": 45000, + "time": "45 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "steel_lump", 2 ] ], @@ -2211,7 +2211,7 @@ "result": "microcentrifuge", "type": "uncraft", "skill_used": "fabrication", - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "using": [ [ "soldering_standard", 15 ] ], "components": [ @@ -2227,7 +2227,7 @@ "result": "gelbox", "type": "uncraft", "skill_used": "fabrication", - "time": 40000, + "time": "40 m", "qualities": [ { "id": "SCREW", "level": 1 } ], "using": [ [ "soldering_standard", 10 ] ], "components": [ @@ -2243,7 +2243,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 8, - "time": 40000, + "time": "40 m", "decomp_learn": [ [ "electronics", 3 ], [ "fabrication", 1 ] ], "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -2254,7 +2254,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 8, - "time": 120000, + "time": "120 m", "decomp_learn": [ [ "electronics", 3 ], [ "fabrication", 2 ] ], "using": [ [ "soldering_standard", 80 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -2264,7 +2264,7 @@ "result": "electric_blanket", "type": "uncraft", "skill_used": "tailor", - "time": 30000, + "time": "30 m", "difficulty": 1, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 25 ] ], [ [ "element", 5 ] ], [ [ "cable", 5 ] ] ] diff --git a/data/json/recipes/recipe_deconstruction_package.json b/data/json/recipes/recipe_deconstruction_package.json index 46b42d91a557b..3cfeeff72448d 100644 --- a/data/json/recipes/recipe_deconstruction_package.json +++ b/data/json/recipes/recipe_deconstruction_package.json @@ -2,7 +2,7 @@ { "result": "mre_accessory", "type": "uncraft", - "time": 60, + "time": "0 m", "components": [ [ [ "pur_tablets", 6 ] ], [ [ "gummy_vitamins", 1 ] ], @@ -20,14 +20,14 @@ { "result": "mre_dessert", "type": "uncraft", - "time": 60, + "time": "0 m", "components": [ [ [ "dry_fruit", 1 ] ], [ [ "chocolate", 1 ] ], [ [ "candy2", 2 ] ], [ [ "cookies", 1 ] ], [ [ "bag_plastic", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "mre_chilibeans_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_chilibeans", 4 ] ], [ [ "crackers", 2 ] ], @@ -42,7 +42,7 @@ { "result": "mre_bbqbeef_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_bbqbeef", 4 ] ], [ [ "crackers", 2 ] ], @@ -57,7 +57,7 @@ { "result": "mre_chickennoodle_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_chickennoodle", 4 ] ], [ [ "crackers", 2 ] ], @@ -72,7 +72,7 @@ { "result": "mre_spaghetti_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_spaghetti", 4 ] ], [ [ "crackers", 2 ] ], @@ -87,7 +87,7 @@ { "result": "mre_chicken_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_chicken", 4 ] ], [ [ "crackers", 2 ] ], @@ -102,7 +102,7 @@ { "result": "mre_beeftaco_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_beeftaco", 4 ] ], [ [ "crackers", 2 ] ], @@ -117,7 +117,7 @@ { "result": "mre_beef_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_beef", 4 ] ], [ [ "crackers", 2 ] ], @@ -132,7 +132,7 @@ { "result": "mre_meatball_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_meatball", 4 ] ], [ [ "crackers", 2 ] ], @@ -147,7 +147,7 @@ { "result": "mre_beefstew_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_beefstew", 4 ] ], [ [ "crackers", 2 ] ], @@ -162,7 +162,7 @@ { "result": "mre_chilimac_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_chilimac", 4 ] ], [ [ "crackers", 2 ] ], @@ -177,7 +177,7 @@ { "result": "mre_veggy_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_veggy", 4 ] ], [ [ "crackers", 2 ] ], @@ -192,7 +192,7 @@ { "result": "mre_macaronimarinara_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_macaronimarinara", 4 ] ], [ [ "crackers", 2 ] ], @@ -207,7 +207,7 @@ { "result": "mre_cheesetort_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_cheesetort", 4 ] ], [ [ "crackers", 2 ] ], @@ -222,7 +222,7 @@ { "result": "mre_mushroomfettuccine_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_mushroomfettuccine", 4 ] ], [ [ "crackers", 2 ] ], @@ -237,7 +237,7 @@ { "result": "mre_mexicanchickenstew_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_mexicanchickenstew", 4 ] ], [ [ "crackers", 2 ] ], @@ -252,7 +252,7 @@ { "result": "mre_chickenburritobowl_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_chickenburritobowl", 4 ] ], [ [ "crackers", 2 ] ], @@ -267,7 +267,7 @@ { "result": "mre_maplesausage_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_maplesausage", 4 ] ], [ [ "crackers", 2 ] ], @@ -282,7 +282,7 @@ { "result": "mre_ravioli_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_ravioli", 4 ] ], [ [ "crackers", 2 ] ], @@ -297,7 +297,7 @@ { "result": "mre_pepperjackbeef_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_pepperjackbeef", 4 ] ], [ [ "crackers", 2 ] ], @@ -312,7 +312,7 @@ { "result": "mre_hashbrownbacon_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_hashbrownbacon", 4 ] ], [ [ "crackers", 2 ] ], @@ -327,7 +327,7 @@ { "result": "mre_lemontuna_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_lemontuna", 4 ] ], [ [ "crackers", 2 ] ], @@ -342,7 +342,7 @@ { "result": "mre_asianbeef_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_asianbeef", 4 ] ], [ [ "crackers", 2 ] ], @@ -357,7 +357,7 @@ { "result": "mre_chickenpesto_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_chickenpesto", 4 ] ], [ [ "crackers", 2 ] ], @@ -372,7 +372,7 @@ { "result": "mre_southwestbeef_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_southwestbeef", 4 ] ], [ [ "crackers", 2 ] ], @@ -387,7 +387,7 @@ { "result": "mre_hotdog_box", "type": "uncraft", - "time": 500, + "time": "0 m", "components": [ [ [ "mre_hotdog", 4 ] ], [ [ "crackers", 2 ] ], diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index 29d1422d9cd28..cc9978ace3a83 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "advanced_electronics", 3 ], [ "textbook_electronics", 3 ] ], @@ -31,7 +31,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "advanced_electronics", 3 ], [ "textbook_electronics", 3 ] ], @@ -55,7 +55,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 5, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "advanced_electronics", 4 ], [ "textbook_electronics", 4 ] ], @@ -80,7 +80,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 5, - "time": 20000, + "time": "20 m", "reversible": true, "book_learn": [ [ "advanced_electronics", 4 ], [ "textbook_electronics", 4 ], [ "textbook_carpentry", 5 ] ], "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], @@ -101,7 +101,7 @@ "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", - "time": 3000, + "time": "3 m", "book_learn": [ [ "radio_book", 1 ], [ "textbook_anarch", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 3 ], [ "knife_butter", 2 ] ] ] @@ -113,7 +113,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 4, - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "radio_book", 3 ], [ "textbook_anarch", 5 ] ], @@ -127,7 +127,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 1, - "time": 4000, + "time": "4 m", "reversible": true, "decomp_learn": 1, "book_learn": [ [ "radio_book", 3 ], [ "manual_electronics", 1 ] ], @@ -142,7 +142,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 1, - "time": 6500, + "time": "6 m", "book_learn": [ [ "manual_electronics", 1 ], [ "textbook_electronics", 2 ], [ "advanced_electronics", 2 ] ], "using": [ [ "soldering_standard", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -155,7 +155,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 1, - "time": 7000, + "time": "7 m", "autolearn": [ [ "electronics", 3 ] ], "book_learn": [ [ "manual_electronics", 1 ], [ "textbook_electronics", 1 ], [ "advanced_electronics", 1 ] ], "using": [ [ "soldering_standard", 5 ] ], @@ -168,7 +168,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 2, - "time": 12000, + "time": "12 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "manual_electronics", 1 ], [ "radio_book", 1 ], [ "textbook_electronics", 2 ] ], @@ -183,7 +183,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 3, - "time": 14000, + "time": "14 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "manual_electronics", 1 ], [ "textbook_electronics", 2 ], [ "textbook_anarch", 3 ] ], @@ -198,7 +198,7 @@ "subcategory": "CSC_ELECTRONIC_LIGHTING", "skill_used": "electronics", "difficulty": 3, - "time": 10000, + "time": "10 m", "reversible": true, "book_learn": [ [ "manual_electronics", 3 ], [ "mag_electronics", 4 ], [ "textbook_electronics", 2 ] ], "using": [ [ "soldering_standard", 7 ] ], @@ -212,7 +212,7 @@ "subcategory": "CSC_ELECTRONIC_LIGHTING", "skill_used": "electronics", "difficulty": 1, - "time": 15000, + "time": "15 m", "book_learn": [ [ "manual_electronics", 1 ], [ "mag_electronics", 1 ] ], "using": [ [ "soldering_standard", 5 ] ], "components": [ @@ -229,7 +229,7 @@ "subcategory": "CSC_ELECTRONIC_LIGHTING", "skill_used": "electronics", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "decomp_learn": 0, "book_learn": [ [ "manual_electronics", 0 ], [ "mag_electronics", 1 ] ], @@ -256,7 +256,7 @@ "skill_used": "mechanics", "skills_required": [ "electronics", 1 ], "difficulty": 2, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 1, "book_learn": [ [ "manual_electronics", 1 ], [ "mag_electronics", 2 ] ], @@ -275,7 +275,7 @@ "skill_used": "mechanics", "skills_required": [ "electronics", 1 ], "difficulty": 2, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 1, "book_learn": [ [ "manual_electronics", 1 ], [ "mag_electronics", 2 ] ], @@ -294,7 +294,7 @@ "skill_used": "mechanics", "skills_required": [ "electronics", 1 ], "difficulty": 2, - "time": 12000, + "time": "12 m", "reversible": true, "decomp_learn": 1, "book_learn": [ [ "manual_electronics", 1 ], [ "mag_electronics", 2 ] ], @@ -316,7 +316,7 @@ "reversible": true, "decomp_learn": 1, "book_learn": [ [ "manual_electronics", 1 ], [ "mag_electronics", 2 ] ], - "time": 14000, + "time": "14 m", "components": [ [ [ "amplifier", 3 ] ], [ [ "plastic_chunk", 3 ], [ "scrap", 4 ] ], @@ -331,7 +331,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 1, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 0, "autolearn": [ [ "electronics", 2 ] ], @@ -351,7 +351,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "radio_book", 1 ], [ "textbook_anarch", 2 ] ], "using": [ [ "soldering_standard", 5 ] ], @@ -376,7 +376,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 2, - "time": 30000, + "time": "30 m", "reversible": true, "book_learn": [ [ "textbook_anarch", 2 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -390,7 +390,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 2, - "time": 25000, + "time": "25 m", "reversible": true, "book_learn": [ [ "radio_book", 2 ], [ "textbook_anarch", 3 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -405,7 +405,7 @@ "skill_used": "mechanics", "skills_required": [ "electronics", 1 ], "difficulty": 3, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "advanced_electronics", 3 ], [ "manual_electronics", 2 ] ], @@ -425,7 +425,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "advanced_electronics", 1 ], [ "mag_electronics", 3 ], [ "manual_electronics", 2 ] ], @@ -454,7 +454,7 @@ "skill_used": "fabrication", "skills_required": [ [ "electronics", 3 ], [ "survival", 3 ] ], "difficulty": 4, - "time": 60000, + "time": "60 m", "decomp_learn": 4, "book_learn": [ [ "textbook_survival", 3 ], [ "advanced_electronics", 3 ], [ "manual_electronics", 3 ] ], "using": [ [ "soldering_standard", 10 ], [ "forging_standard", 10 ] ], @@ -475,7 +475,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "advanced_electronics", 1 ], [ "mag_electronics", 3 ], [ "manual_electronics", 2 ] ], @@ -504,7 +504,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 3, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "advanced_electronics", 2 ], [ "textbook_electronics", 3 ], [ "textbook_anarch", 3 ] ], @@ -519,7 +519,7 @@ "subcategory": "CSC_ELECTRONIC_PARTS", "skill_used": "electronics", "difficulty": 2, - "time": 11000, + "time": "11 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "mag_electronics", 2 ] ], @@ -534,7 +534,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 4, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 4, "using": [ [ "soldering_standard", 14 ] ], @@ -556,7 +556,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 1 ], "difficulty": 4, - "time": 35000, + "time": "35 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_anarch", 3 ], [ "advanced_electronics", 5 ] ], @@ -572,7 +572,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 1 ], "difficulty": 5, - "time": 40000, + "time": "40 m", "reversible": true, "note": "you might be able to reverse-engineer assembly, but not the music", "book_learn": [ [ "textbook_electronics", 6 ], [ "textbook_robots", 5 ] ], @@ -588,7 +588,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 5 ], "difficulty": 8, - "time": 60000, + "time": "60 m", "reversible": true, "note": "as with mp3, no learning how to encode the software from taking it apart", "book_learn": [ [ "textbook_electronics", 7 ], [ "textbook_robots", 6 ] ], @@ -611,7 +611,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 5, - "time": 35000, + "time": "35 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "advanced_electronics", 4 ], [ "textbook_electronics", 4 ], [ "atomic_survival", 3 ] ], @@ -626,7 +626,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 7, - "time": 35000, + "time": "35 m", "reversible": true, "decomp_learn": 7, "book_learn": [ [ "advanced_electronics", 6 ], [ "textbook_electronics", 6 ], [ "atomic_survival", 5 ] ], @@ -641,7 +641,7 @@ "subcategory": "CSC_ELECTRONIC_COMPONENTS", "skill_used": "electronics", "difficulty": 5, - "time": 45000, + "time": "45 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -664,7 +664,7 @@ "skill_used": "electronics", "skills_required": [ "mechanics", 1 ], "difficulty": 9, - "time": 85000, + "time": "85 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "recipe_lab_elec", 7 ] ], @@ -680,7 +680,7 @@ "skill_used": "electronics", "skills_required": [ "firstaid", 5 ], "difficulty": 6, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "recipe_mil_augs", 5 ] ], @@ -696,7 +696,7 @@ "skill_used": "electronics", "skills_required": [ "firstaid", 5 ], "difficulty": 6, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "recipe_mil_augs", 5 ] ], @@ -712,7 +712,7 @@ "skill_used": "electronics", "skills_required": [ "firstaid", 5 ], "difficulty": 6, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "recipe_mil_augs", 5 ] ], @@ -728,7 +728,7 @@ "skill_used": "electronics", "skills_required": [ "firstaid", 5 ], "difficulty": 6, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "recipe_mil_augs", 6 ] ], @@ -743,7 +743,7 @@ "subcategory": "CSC_ELECTRONIC_PARTS", "skill_used": "electronics", "difficulty": 6, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 6, "book_learn": [ [ "textbook_mechanics", 7 ], [ "textbook_electronics", 6 ], [ "advanced_electronics", 6 ], [ "textbook_robots", 5 ] ], @@ -759,7 +759,7 @@ "skill_used": "electronics", "skills_required": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], "difficulty": 8, - "time": 50000, + "time": "50 m", "decomp_learn": 5, "autolearn": true, "book_learn": [ [ "manual_electronics", 7 ], [ "textbook_electronics", 6 ], [ "advanced_electronics", 6 ] ], @@ -783,7 +783,7 @@ "skill_used": "electronics", "skills_required": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], "difficulty": 10, - "time": 50000, + "time": "50 m", "decomp_learn": 5, "autolearn": true, "book_learn": [ [ "recipe_augs", 7 ], [ "recipe_lab_elec", 7 ], [ "advanced_electronics", 8 ] ], @@ -806,7 +806,7 @@ "subcategory": "CSC_ELECTRONIC_PARTS", "skill_used": "electronics", "difficulty": 8, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 5, "autolearn": true, @@ -823,7 +823,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 3, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -846,7 +846,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 5 ], "difficulty": 5, - "time": 180000, + "time": "180 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -877,7 +877,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 4 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -906,7 +906,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 6 ], "difficulty": 6, - "time": 200000, + "time": "200 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -942,7 +942,7 @@ "subcategory": "CSC_ELECTRONIC_PARTS", "skill_used": "electronics", "difficulty": 10, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "textbook_robots", 8 ] ], @@ -963,7 +963,7 @@ "subcategory": "CSC_ELECTRONIC_PARTS", "skill_used": "mechanics", "difficulty": 4, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -986,7 +986,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 4 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_mechanics", 6 ], [ "textbook_electronics", 8 ], [ "textbook_fabrication", 8 ], [ "welding_book", 5 ] ], @@ -1002,7 +1002,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 4 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_mechanics", 6 ], [ "textbook_electronics", 8 ], [ "textbook_fabrication", 8 ], [ "welding_book", 5 ] ], @@ -1018,7 +1018,7 @@ "skill_used": "mechanics", "skills_required": [ "electronics", 4 ], "difficulty": 4, - "time": 10000, + "time": "10 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_mechanics", 6 ], [ "textbook_electronics", 8 ], [ "textbook_fabrication", 8 ], [ "welding_book", 5 ] ], @@ -1033,7 +1033,7 @@ "skill_used": "mechanics", "skills_required": [ "electronics", 4 ], "difficulty": 4, - "time": 50000, + "time": "50 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_mechanics", 6 ], [ "textbook_electronics", 8 ], [ "textbook_fabrication", 8 ], [ "welding_book", 5 ] ], @@ -1049,7 +1049,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "textbook_fabrication", 3 ], [ "manual_fabrication", 3 ], [ "manual_electronics", 3 ], [ "manual_mechanics", 3 ] ], @@ -1073,7 +1073,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "textbook_fabrication", 3 ], [ "manual_fabrication", 3 ], [ "manual_electronics", 3 ], [ "manual_mechanics", 3 ] ], @@ -1095,7 +1095,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 2 ], "difficulty": 3, - "time": 40000, + "time": "40 m", "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1110,7 +1110,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 3 ], "difficulty": 3, - "time": 40000, + "time": "40 m", "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1130,7 +1130,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 3 ], "difficulty": 3, - "time": 120000, + "time": "120 m", "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], "using": [ [ "soldering_standard", 80 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1144,7 +1144,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 5 ], [ "computer", 5 ] ], "difficulty": 6, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 7, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "textbook_robots", 7 ] ], @@ -1169,7 +1169,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 5 ], [ "computer", 5 ] ], "difficulty": 6, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 7, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "textbook_robots", 7 ] ], @@ -1194,7 +1194,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 6 ], [ "computer", 5 ] ], "difficulty": 7, - "time": 35000, + "time": "35 m", "reversible": true, "decomp_learn": 8, "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_robots", 8 ] ], @@ -1219,7 +1219,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 5 ], [ "computer", 5 ] ], "difficulty": 6, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 7, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "textbook_robots", 7 ] ], @@ -1244,7 +1244,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 5 ], [ "computer", 5 ] ], "difficulty": 6, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 7, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "textbook_robots", 7 ] ], @@ -1269,7 +1269,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 5 ], [ "computer", 5 ] ], "difficulty": 6, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 7, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "textbook_robots", 7 ] ], @@ -1294,7 +1294,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 5 ], [ "computer", 5 ] ], "difficulty": 6, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 7, "book_learn": [ [ "recipe_lab_elec", 6 ], [ "textbook_robots", 7 ] ], @@ -1319,7 +1319,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 5 ], [ "computer", 5 ] ], "difficulty": 7, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 8, "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_robots", 9 ] ], @@ -1350,7 +1350,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 8 ], [ "computer", 5 ] ], "difficulty": 8, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 9, "book_learn": [ [ "recipe_lab_elec", 8 ] ], @@ -1382,7 +1382,7 @@ "skill_used": "electronics", "skills_required": [ [ "mechanics", 6 ], [ "computer", 5 ] ], "difficulty": 8, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 8, "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_robots", 9 ] ], @@ -1416,7 +1416,7 @@ "reversible": true, "decomp_learn": 8, "book_learn": [ [ "schematics_nursebot", 7 ] ], - "time": 60000, + "time": "60 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1448,7 +1448,7 @@ "decomp_learn": 8, "book_learn": [ [ "schematics_hazmatbot", 7 ] ], "difficulty": 6, - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1478,7 +1478,7 @@ "decomp_learn": 8, "book_learn": [ [ "schematics_copbot", 7 ] ], "difficulty": 6, - "time": 50000, + "time": "50 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1511,7 +1511,7 @@ "decomp_learn": 5, "book_learn": [ [ "schematics_eyebot", 7 ] ], "difficulty": 4, - "time": 30000, + "time": "30 m", "using": [ [ "soldering_standard", 3 ], [ "welding_standard", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1541,7 +1541,7 @@ "decomp_learn": 5, "book_learn": [ [ "schematics_molebot", 7 ] ], "difficulty": 3, - "time": 30000, + "time": "30 m", "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 6 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1570,7 +1570,7 @@ "decomp_learn": 8, "book_learn": [ [ "schematics_riotbot", 7 ] ], "difficulty": 6, - "time": 40000, + "time": "40 m", "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1603,7 +1603,7 @@ "decomp_learn": 5, "book_learn": [ [ "schematics_skitterbot", 7 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1636,7 +1636,7 @@ "decomp_learn": 8, "book_learn": [ [ "schematics_sciencebot", 7 ] ], "difficulty": 5, - "time": 60000, + "time": "60 m", "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1671,7 +1671,7 @@ "decomp_learn": 8, "book_learn": [ [ "schematics_tankbot", 9 ] ], "difficulty": 9, - "time": 75000, + "time": "75 m", "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1709,7 +1709,7 @@ "decomp_learn": 8, "book_learn": [ [ "schematics_tripod", 9 ] ], "difficulty": 9, - "time": 60000, + "time": "60 m", "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1743,7 +1743,7 @@ "decomp_learn": 9, "book_learn": [ [ "schematics_chickenbot", 10 ] ], "difficulty": 10, - "time": 75000, + "time": "75 m", "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1781,7 +1781,7 @@ "decomp_learn": 5, "book_learn": [ [ "schematics_antimateriel", 7 ] ], "difficulty": 5, - "time": 75000, + "time": "75 m", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, @@ -1809,7 +1809,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 4 ], "difficulty": 7, - "time": 25000, + "time": "25 m", "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_robots", 7 ] ], "using": [ [ "soldering_standard", 14 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1823,7 +1823,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 4, - "time": 36000, + "time": "36 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -1846,7 +1846,7 @@ "subcategory": "CSC_ELECTRONIC_LIGHTING", "skill_used": "electronics", "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "book_learn": [ [ "recipe_caseless", 6 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1865,7 +1865,7 @@ "subcategory": "CSC_ELECTRONIC_LIGHTING", "skill_used": "electronics", "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "book_learn": [ [ "recipe_caseless", 6 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1884,7 +1884,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 4, - "time": 3000, + "time": "3 m", "reversible": true, "book_learn": [ [ "recipe_caseless", 8 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1905,7 +1905,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 4, - "time": 3000, + "time": "3 m", "reversible": true, "decomp_learn": 3, "book_learn": [ @@ -1935,7 +1935,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 1 ], "difficulty": 3, - "time": 21000, + "time": "21 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ] ], @@ -1951,7 +1951,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 1 ], "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 2 ] ], @@ -1967,7 +1967,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 1 ], "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 2 ] ], @@ -1983,7 +1983,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 2 ], "difficulty": 5, - "time": 3000, + "time": "3 m", "autolearn": true, "charges": 1, "qualities": [ @@ -2002,7 +2002,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 5, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 5, "book_learn": [ @@ -2022,7 +2022,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 4, "book_learn": [ @@ -2043,7 +2043,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 2 ], "difficulty": 7, - "time": 60000, + "time": "60 m", "reversible": true, "autolearn": true, "book_learn": [ [ "recipe_lab_elec", 5 ], [ "textbook_robots", 5 ] ], @@ -2067,7 +2067,7 @@ "skill_used": "mechanics", "skills_required": [ "electronics", 4 ], "difficulty": 8, - "time": 120000, + "time": "120 m", "reversible": true, "book_learn": [ [ "textbook_mechanics", 8 ], [ "textbook_robots", 7 ] ], "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 5 ] ], @@ -2094,7 +2094,7 @@ "skill_used": "electronics", "skills_required": [ "mechanics", 1 ], "difficulty": 3, - "time": 60000, + "time": "60 m", "reversible": true, "autolearn": true, "using": [ [ "soldering_standard", 150 ] ], @@ -2109,7 +2109,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 2 ], "difficulty": 6, - "time": 120000, + "time": "120 m", "reversible": true, "autolearn": true, "using": [ [ "soldering_standard", 150 ] ], @@ -2124,7 +2124,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 3 ], "difficulty": 7, - "time": 180000, + "time": "180 m", "book_learn": [ [ "textbook_electronics", 6 ], [ "advanced_electronics", 6 ] ], "using": [ [ "soldering_standard", 50 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -2140,7 +2140,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 1 ], "difficulty": 5, - "time": 90000, + "time": "90 m", "autolearn": true, "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], @@ -2158,7 +2158,7 @@ "skill_used": "electronics", "skills_required": [ "mechanics", 2 ], "difficulty": 4, - "time": 40000, + "time": "40 m", "reversible": true, "book_learn": [ [ "advanced_electronics", 4 ], [ "mag_electronics", 6 ], [ "manual_electronics", 5 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -2181,7 +2181,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 5 ], "difficulty": 5, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "repeater_mod_guide", 2 ] ], @@ -2207,7 +2207,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 1 ], "difficulty": 3, - "time": 20000, + "time": "20 m", "reversible": true, "book_learn": [ [ "advanced_electronics", 4 ], @@ -2230,7 +2230,7 @@ "book_learn": [ [ "advanced_electronics", 3 ], [ "textbook_electronics", 2 ] ], "using": [ [ "soldering_standard", 5 ] ], "difficulty": 4, - "time": 15000, + "time": "15 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -2250,7 +2250,7 @@ "skill_used": "electronics", "using": [ [ "soldering_standard", 10 ] ], "difficulty": 2, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -2265,7 +2265,7 @@ "using": [ [ "soldering_standard", 10 ] ], "difficulty": 4, "book_learn": [ [ "textbook_mechanics", 5 ] ], - "time": 60000, + "time": "60 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 2 } ], "components": [ [ [ "cu_pipe", 3 ] ], @@ -2283,7 +2283,7 @@ "using": [ [ "soldering_standard", 50 ] ], "difficulty": 4, "book_learn": [ [ "textbook_mechanics", 5 ] ], - "time": 60000, + "time": "60 m", "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "ANVIL", "level": 2 } ], "components": [ [ [ "cu_pipe", 4 ] ], [ [ "sheet_metal_small", 8 ] ], [ [ "sheet_metal", 2 ] ] ] } diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 2f6b170663d84..52c429e981ac4 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -5,7 +5,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 5000, + "time": "5 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -19,7 +19,7 @@ "id_suffix": "using_water_purifier", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 150, + "time": "0 m", "autolearn": true, "tools": [ [ [ "water_purifier", 1 ] ] ], "components": [ [ [ "water", 1 ] ] ] @@ -31,7 +31,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -45,7 +45,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -58,7 +58,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -71,7 +71,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -82,7 +82,7 @@ "type": "recipe", "result": "meat_scrap_cooked", "copy-from": "meat_cooked", - "time": 750, + "time": "0 m", "tools": [ [ [ "surface_heat", 1, "LIST" ] ] ], "components": [ [ [ "meat_scrap", 1 ] ] ] }, @@ -95,7 +95,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 83, 5 ], "autolearn": true, "container": "jar_glass_sealed", @@ -115,7 +115,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 24000, + "time": "24 m", "batch_time_factors": [ 83, 5 ], "autolearn": true, "contained": true, @@ -141,7 +141,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 83, 5 ], "autolearn": true, "container": "jar_glass_sealed", @@ -161,7 +161,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -174,7 +174,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -187,7 +187,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -200,7 +200,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -213,7 +213,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -227,7 +227,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 10000, + "time": "10 m", "charges": 6, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -242,7 +242,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 10000, + "time": "10 m", "charges": 3, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -257,7 +257,7 @@ "skill_used": "cooking", "difficulty": 4, "charges": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -280,7 +280,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 16, - "time": 20000, + "time": "20 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -293,7 +293,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -305,7 +305,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -317,7 +317,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "book_learn": [ [ "cookbook_human", 4 ] ], "flags": [ "BLIND_HARD" ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -329,7 +329,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -341,7 +341,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -354,7 +354,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 9000, + "time": "9 m", "charges": 4, "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -380,7 +380,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 60000, + "time": "60 m", "charges": 1, "autolearn": true, "batch_time_factors": [ 83, 3 ], @@ -395,7 +395,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 60000, + "time": "60 m", "charges": 1, "autolearn": true, "batch_time_factors": [ 83, 3 ], @@ -411,7 +411,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 1, - "time": 16000, + "time": "16 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "frying_oil", 1, "LIST" ] ], [ [ "surface_heat", 8, "LIST" ] ] ], @@ -424,7 +424,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 3, - "time": 16000, + "time": "16 m", "charges": 1, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -440,7 +440,7 @@ "difficulty": 2, "charges": 1, "book_learn": [ [ "cookbook_sushi", 2 ] ], - "time": 10000, + "time": "10 m", "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ @@ -458,7 +458,7 @@ "skill_used": "cooking", "difficulty": 2, "book_learn": [ [ "cookbook_sushi", 2 ] ], - "time": 5000, + "time": "5 m", "charges": 3, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ @@ -483,7 +483,7 @@ "skill_used": "cooking", "difficulty": 3, "book_learn": [ [ "cookbook_sushi", 3 ] ], - "time": 8000, + "time": "8 m", "charges": 2, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ @@ -520,7 +520,7 @@ "skill_used": "cooking", "difficulty": 3, "book_learn": [ [ "cookbook_sushi", 3 ] ], - "time": 45000, + "time": "45 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], "batch_time_factors": [ 50, 2 ], @@ -534,7 +534,7 @@ "skill_used": "cooking", "difficulty": 1, "book_learn": [ [ "cookbook_sushi", 2 ] ], - "time": 5000, + "time": "5 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "tofu", 1 ] ] ] @@ -547,7 +547,7 @@ "skill_used": "cooking", "difficulty": 3, "book_learn": [ [ "cookbook_sushi", 3 ] ], - "time": 45000, + "time": "45 m", "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "batch_time_factors": [ 25, 2 ], @@ -575,7 +575,7 @@ "skill_used": "cooking", "difficulty": 3, "book_learn": [ [ "cookbook_sushi", 3 ] ], - "time": 6000, + "time": "6 m", "charges": 2, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ @@ -601,7 +601,7 @@ "skill_used": "cooking", "difficulty": 3, "book_learn": [ [ "cookbook_sushi", 3 ] ], - "time": 6000, + "time": "6 m", "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "sushi_rice", 2 ] ], @@ -626,7 +626,7 @@ "skill_used": "cooking", "difficulty": 4, "book_learn": [ [ "cookbook_sushi", 4 ] ], - "time": 9000, + "time": "9 m", "charges": 2, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ @@ -651,7 +651,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "protein_powder", 1 ] ], [ [ "water_clean", 1 ] ] ] @@ -662,7 +662,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "book_learn": [ [ "cookbook_human", 0 ] ], "components": [ [ [ "hflesh_powder", 1 ] ], [ [ "water_clean", 1 ] ] ] }, @@ -672,7 +672,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -687,7 +687,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "book_learn": [ [ "cookbook_human", 0 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -703,7 +703,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 60000, + "time": "60 m", "charges": 6, "autolearn": true, "batch_time_factors": [ 83, 3 ], @@ -729,7 +729,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], @@ -754,7 +754,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 10000, + "time": "10 m", "charges": 6, "autolearn": true, "batch_time_factors": [ 50, 3 ], @@ -778,7 +778,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -793,7 +793,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 15000, + "time": "15 m", "charges": 15, "autolearn": true, "batch_time_factors": [ 83, 3 ], @@ -811,7 +811,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 15000, + "time": "15 m", "charges": 15, "batch_time_factors": [ 83, 3 ], "book_learn": [ [ "cookbook_human", 4 ] ], @@ -828,7 +828,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -842,7 +842,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 60000, + "time": "60 m", "book_learn": [ [ "cookbook_human", 4 ] ], "batch_time_factors": [ 83, 3 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -857,7 +857,7 @@ "skill_used": "cooking", "difficulty": 4, "charges": 6, - "time": 60000, + "time": "60 m", "batch_time_factors": [ 83, 3 ], "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], @@ -881,7 +881,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 15000, + "time": "15 m", "charges": 1, "autolearn": true, "batch_time_factors": [ 67, 5 ], @@ -896,7 +896,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 4, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], @@ -909,7 +909,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 4, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], @@ -921,7 +921,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -933,7 +933,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -948,7 +948,7 @@ "difficulty": 1, "byproducts": [ [ "plant_fibre" ] ], "skills_required": [ "survival", 1 ], - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 40, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], @@ -963,7 +963,7 @@ "skill_used": "cooking", "difficulty": 1, "skills_required": [ "survival", 1 ], - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -976,7 +976,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 3, - "time": 8000, + "time": "8 m", "autolearn": true, "note": "the cooking oil isn't supposed to be expended since you can recycle it after frying the morel", "qualities": [ { "id": "COOK", "level": 2 } ], @@ -990,7 +990,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 12000, + "time": "12 m", "book_learn": [ [ "pocket_survival", 1 ], [ "survival_book", 1 ], @@ -1010,7 +1010,7 @@ "skill_used": "cooking", "difficulty": 2, "skills_required": [ "survival", 2 ], - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -1024,7 +1024,7 @@ "skill_used": "cooking", "difficulty": 3, "skills_required": [ "survival", 2 ], - "time": 8000, + "time": "8 m", "autolearn": true, "note": "the cooking oil isn't supposed to be expended since you can recycle it after frying the dandelions", "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], @@ -1039,7 +1039,7 @@ "skill_used": "cooking", "difficulty": 3, "skills_required": [ "survival", 2 ], - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "food_processor", 20 ] ] ], @@ -1051,7 +1051,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 2500, + "time": "2 m", "autolearn": true, "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "frozen_burrito", 1 ] ] ] @@ -1062,7 +1062,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 5000, + "time": "5 m", "autolearn": true, "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "frozen_dinner", 1 ] ] ] @@ -1075,7 +1075,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -1088,7 +1088,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -1101,7 +1101,7 @@ "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", "difficulty": 3, - "time": 16000, + "time": "16 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ [ "frying_oil", 1, "LIST" ] ] ], @@ -1114,7 +1114,7 @@ "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", "difficulty": 1, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -1127,7 +1127,7 @@ "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", "difficulty": 3, - "time": 16000, + "time": "16 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ [ "frying_oil", 1, "LIST" ] ] ], @@ -1139,7 +1139,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 20000, + "time": "20 m", "charges": 3, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -1152,7 +1152,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 20000, + "time": "20 m", "charges": 5, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -1168,7 +1168,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 20000, + "time": "20 m", "charges": 3, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -1185,7 +1185,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 20000, + "time": "20 m", "charges": 3, "book_learn": [ [ "cookbook_human", 0 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -1198,7 +1198,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 20000, + "time": "20 m", "charges": 3, "book_learn": [ [ "cookbook_human", 0 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -1216,7 +1216,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 3, - "time": 16000, + "time": "16 m", "autolearn": true, "note": "the cooking oil isn't supposed to be expended since you can recycle it after frying the potatoes", "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -1229,7 +1229,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -1241,7 +1241,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -1253,7 +1253,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 300, + "time": "0 m", "autolearn": true, "components": [ [ [ "popcorn", 1 ] ], [ [ "salt", 1 ], [ "seasoning_salt", 1 ] ] ] }, @@ -1263,7 +1263,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -1277,7 +1277,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -1292,7 +1292,7 @@ "skill_used": "cooking", "difficulty": 2, "skills_required": [ "survival", 2 ], - "time": 10000, + "time": "10 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "pocket_survival", 1 ], @@ -1313,7 +1313,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 12000, + "time": "12 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "pocket_survival", 1 ], @@ -1335,7 +1335,7 @@ "skill_used": "cooking", "difficulty": 3, "result_mult": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -1349,7 +1349,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "contained": true, "batch_time_factors": [ 80, 4 ], @@ -1363,7 +1363,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 120000, + "time": "120 m", "//": "2 hours of roasting are required to fully break up the toxins in raw pods", "autolearn": true, "batch_time_factors": [ 90, 1 ], @@ -1378,7 +1378,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -1391,7 +1391,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -1404,7 +1404,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 6000, + "time": "6 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "tools": [ [ [ "atomic_coffeepot", -1 ] ] ], @@ -1416,7 +1416,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -1431,7 +1431,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 15000, + "time": "15 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ], [ [ "mortar_pestle", -1 ] ] ], "autolearn": true, @@ -1444,7 +1444,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 9000, + "time": "9 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "food_processor", 20 ] ], [ [ "rag", -1 ] ] ], "autolearn": true, @@ -1457,7 +1457,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 13000, + "time": "13 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "food_processor", 20 ] ], [ [ "rag", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], "autolearn": true, @@ -1471,7 +1471,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ [ "milk_powder", 1 ] ], [ [ "water_clean", 1 ] ] ] }, @@ -1483,7 +1483,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ [ "con_milk", 5 ] ], [ [ "water_clean", 1 ] ] ] }, @@ -1495,7 +1495,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ] ], @@ -1508,7 +1508,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 12000, + "time": "12 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -1525,7 +1525,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "dahlia_root", 10 ], [ "potato", 5 ], [ "irradiated_potato", 5 ] ] ] @@ -1539,7 +1539,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 40000, + "time": "40 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "cattail_rhizome", 2 ] ] ] @@ -1552,7 +1552,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ] ], @@ -1566,7 +1566,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ] ], @@ -1580,7 +1580,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 2, - "time": 7000, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ] ], @@ -1593,7 +1593,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "irradiated_lemon", 2 ], [ "lemon", 2 ] ], [ [ "sugar", 10 ] ], [ [ "water_clean", 1 ] ] ] @@ -1605,7 +1605,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 500, + "time": "0 m", "autolearn": true, "components": [ [ [ "lemonade_powder", 1 ] ], [ [ "water_clean", 1 ] ] ] }, @@ -1617,7 +1617,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 7000, + "time": "7 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "orangesoda", 1 ] ], [ [ "cola", 1 ] ] ] @@ -1630,7 +1630,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 7000, + "time": "7 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "lemonlime", 1 ] ], [ [ "cranberry_juice", 1 ] ] ] @@ -1642,7 +1642,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 7000, + "time": "7 m", "charges": 1, "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -1660,7 +1660,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 7000, + "time": "7 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ @@ -1679,7 +1679,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 7000, + "time": "7 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "oj", 1 ] ], [ [ "vodka", 1 ] ] ] @@ -1691,7 +1691,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 7000, + "time": "7 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "apple_cider", 1 ] ], [ [ "vodka", 1 ] ] ] @@ -1703,7 +1703,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 7000, + "time": "7 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "rum", 1 ] ], [ [ "cola", 1 ] ] ] @@ -1715,7 +1715,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "batch_time_factors": [ 50, 5 ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -1745,7 +1745,7 @@ "skill_used": "cooking", "difficulty": 5, "//": "Gelatin from bones is just boiling them long enough. Gelatin from pectin is harder. Instead of duping the ingredients, *1.5 them for aforementioned pectin.", - "time": 40000, + "time": "40 m", "autolearn": true, "batch_time_factors": [ 50, 5 ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -1759,7 +1759,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "charges": 2, "book_learn": [ [ "cookbook_human", 4 ] ], "batch_time_factors": [ 50, 5 ], @@ -1778,7 +1778,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 60000, + "time": "60 m", "charges": 1, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -1803,7 +1803,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 83, 5 ], "autolearn": true, "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -1827,7 +1827,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 30000, + "time": "30 m", "charges": 1, "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "cookbook_human", 3 ] ], @@ -1853,7 +1853,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 7, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -1867,7 +1867,7 @@ "skill_used": "cooking", "difficulty": 5, "charges": 4, - "time": 45000, + "time": "45 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -1909,7 +1909,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "components": [ [ [ "water_clean", 2 ] ], @@ -1929,7 +1929,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "charges": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -1951,7 +1951,7 @@ "skill_used": "cooking", "difficulty": 5, "skills_required": [ "survival", 4 ], - "time": 60000, + "time": "60 m", "autolearn": true, "batch_time_factors": [ 50, 5 ], "book_learn": [ [ "survival_book", 3 ], [ "textbook_survival", 3 ], [ "manual_survival", 3 ] ], @@ -1971,7 +1971,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2007,7 +2007,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 60000, + "time": "60 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2021,7 +2021,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 60000, + "time": "60 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "cookbook_human", 1 ] ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2035,7 +2035,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "charges": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -2058,7 +2058,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -2080,7 +2080,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -2106,7 +2106,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2149,7 +2149,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "charges": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -2191,7 +2191,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "charges": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -2256,7 +2256,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 20000, + "time": "20 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2307,7 +2307,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "charges": 1, "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "cookbook_human", 2 ] ], @@ -2348,7 +2348,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 10000, + "time": "10 m", "charges": 3, "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2378,7 +2378,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2444,7 +2444,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 1, - "time": 15000, + "time": "15 m", "charges": 2, "batch_time_factors": [ 50, 4 ], "autolearn": true, @@ -2460,7 +2460,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 10, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], @@ -2474,7 +2474,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 4, - "time": 80000, + "time": "80 m", "charges": 16, "autolearn": true, "batch_time_factors": [ 60, 3 ], @@ -2489,7 +2489,7 @@ "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "book_learn": [ [ "family_cookbook", 5 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ [ "thermometer", -1 ] ] ], @@ -2502,7 +2502,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 45000, + "time": "45 m", "book_learn": [ [ "family_cookbook", 5 ] ], "qualities": [ { "id": "BUTCHER", "level": 20 }, { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], @@ -2530,7 +2530,7 @@ "skill_used": "cooking", "difficulty": 4, "charges": 6, - "time": 60000, + "time": "60 m", "book_learn": [ [ "family_cookbook", 4 ] ], "batch_time_factors": [ 83, 3 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], @@ -2557,7 +2557,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 7, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -2571,7 +2571,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 10, - "time": 18000, + "time": "18 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2586,7 +2586,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 5, - "time": 18000, + "time": "18 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2601,7 +2601,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 1, - "time": 90000, + "time": "90 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2619,7 +2619,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 2, - "time": 28000, + "time": "28 m", "charges": 8, "batch_time_factors": [ 50, 4 ], "autolearn": true, @@ -2639,7 +2639,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 1, - "time": 14000, + "time": "14 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2657,7 +2657,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 6000, + "time": "6 m", "autolearn": true, "batch_time_factors": [ 82, 4 ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2670,7 +2670,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 6000, + "time": "6 m", "autolearn": true, "batch_time_factors": [ 82, 4 ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2684,7 +2684,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2731,7 +2731,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2755,7 +2755,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "batch_time_factors": [ 82, 4 ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2769,7 +2769,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2808,7 +2808,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2821,7 +2821,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 300, + "time": "0 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2834,7 +2834,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "batch_time_factors": [ 82, 4 ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -2852,7 +2852,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 9000, + "time": "9 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2893,7 +2893,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 2, - "time": 9000, + "time": "9 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2919,7 +2919,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 45000, + "time": "45 m", "autolearn": true, "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ], "components": [ [ [ "oats", 2 ] ] ] @@ -2930,7 +2930,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2942,7 +2942,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -2990,7 +2990,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 45000, + "time": "45 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ], @@ -3003,7 +3003,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 9000, + "time": "9 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3018,7 +3018,7 @@ "skills_required": [ "survival", 2 ], "difficulty": 1, "charges": 1, - "time": 1500, + "time": "1 m", "autolearn": true, "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "pinecone", 1 ] ] ] @@ -3031,7 +3031,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3045,7 +3045,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3060,7 +3060,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3075,7 +3075,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3090,7 +3090,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3104,7 +3104,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3119,7 +3119,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3133,7 +3133,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3148,7 +3148,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3162,7 +3162,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3177,7 +3177,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3191,7 +3191,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3206,7 +3206,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3220,7 +3220,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3235,7 +3235,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3250,7 +3250,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3264,7 +3264,7 @@ "skill_used": "survival", "difficulty": 1, "charges": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3279,7 +3279,7 @@ "skills_required": [ "survival", 1 ], "difficulty": 1, "charges": 1, - "time": 24000, + "time": "24 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -3292,7 +3292,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 5, - "time": 48000, + "time": "48 m", "charges": 10, "book_learn": [ [ "family_cookbook", 5 ], [ "survival_book", 3 ], [ "textbook_survival", 3 ] ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 2 } ], @@ -3318,7 +3318,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 3, - "time": 45000, + "time": "45 m", "charges": 6, "autolearn": true, "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -3350,7 +3350,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3364,7 +3364,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3377,7 +3377,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -3391,7 +3391,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3432,7 +3432,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3473,7 +3473,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 3, - "time": 12000, + "time": "12 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -3493,7 +3493,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 3, - "time": 12000, + "time": "12 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -3514,7 +3514,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 3, - "time": 12000, + "time": "12 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -3535,7 +3535,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 3, - "time": 12000, + "time": "12 m", "charges": 3, "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], @@ -3561,7 +3561,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 3, - "time": 12000, + "time": "12 m", "autolearn": true, "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ [ "waffleiron", -1 ] ] ], "components": [ @@ -3581,7 +3581,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 3, - "time": 12000, + "time": "12 m", "autolearn": true, "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ [ "waffleiron", -1 ] ] ], "components": [ @@ -3602,7 +3602,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 3, - "time": 12000, + "time": "12 m", "charges": 5, "autolearn": true, "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ [ "waffleiron", -1 ] ], [ [ "cooking_oil", 1 ], [ "cooking_oil2", 1 ] ] ], @@ -3624,7 +3624,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 1, - "time": 18000, + "time": "18 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -3648,7 +3648,7 @@ "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", "difficulty": 4, - "time": 12000, + "time": "12 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -3678,7 +3678,7 @@ "skill_used": "cooking", "difficulty": 1, "result_mult": 2, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3692,7 +3692,7 @@ "skill_used": "cooking", "difficulty": 1, "result_mult": 2, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3705,7 +3705,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 4, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3745,7 +3745,7 @@ "skill_used": "cooking", "difficulty": 4, "result_mult": 2, - "time": 8000, + "time": "8 m", "book_learn": [ [ "cookbook_italian", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -3758,7 +3758,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 3, - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], @@ -3777,7 +3777,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 4, - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], @@ -3795,7 +3795,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 4, - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], @@ -3822,7 +3822,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 4, - "time": 25000, + "time": "25 m", "book_learn": [ [ "cookbook_human", 3 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], @@ -3840,7 +3840,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 6, - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], @@ -3858,7 +3858,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -3892,7 +3892,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -3928,7 +3928,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "charges": 2, "book_learn": [ [ "cookbook_italian", 2 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -3958,7 +3958,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "charges": 2, "book_learn": [ [ "cookbook_human", 2 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], @@ -3988,7 +3988,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "cookbook_italian", 2 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -4015,7 +4015,7 @@ "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -4029,7 +4029,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 2, - "time": 5000, + "time": "5 m", "book_learn": [ [ "cookbook_italian", 2 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ @@ -4046,7 +4046,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "cookbook_italian", 2 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -4064,7 +4064,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "cookbook_italian", 2 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -4093,7 +4093,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 20000, + "time": "20 m", "book_learn": [ [ "cookbook_human", 3 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -4117,7 +4117,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 5, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_chemistry", 6 ], [ "adv_chemistry", 6 ], @@ -4136,7 +4136,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 6, - "time": 48000, + "time": "48 m", "autolearn": true, "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], @@ -4151,7 +4151,7 @@ "skills_required": [ "survival", 2 ], "skill_used": "cooking", "difficulty": 2, - "time": 48000, + "time": "48 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], @@ -4165,7 +4165,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "charges": 10, "autolearn": true, "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -4201,7 +4201,7 @@ "note": "high-temperature acid hydrolysis, to extract edible wood sugars", "skill_used": "cooking", "difficulty": 7, - "time": 60000, + "time": "60 m", "book_learn": [ [ "adv_chemistry", 7 ], [ "textbook_chemistry", 8 ], [ "recipe_labchem", 6 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], @@ -4219,7 +4219,7 @@ "note": "process sugar beets into sugar", "skill_used": "cooking", "difficulty": 5, - "time": 90000, + "time": "90 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 5 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 40, "LIST" ] ] ], @@ -4235,7 +4235,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -4252,7 +4252,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -4270,7 +4270,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "book_learn": [ [ "cookbook_human", 4 ] ], "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -4287,7 +4287,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -4309,7 +4309,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -4333,7 +4333,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -4389,7 +4389,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -4434,7 +4434,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -4482,7 +4482,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -4553,7 +4553,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "book_learn": [ [ "cookbook_human", 4 ] ], "batch_time_factors": [ 80, 4 ], @@ -4598,7 +4598,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -4640,7 +4640,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -4659,7 +4659,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "result_mult": 2, "book_learn": [ [ "cookbook_human", 4 ] ], "batch_time_factors": [ 80, 4 ], @@ -4676,7 +4676,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 83, 5 ], "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -4696,7 +4696,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ], @@ -4716,7 +4716,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 83, 5 ], "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -4736,7 +4736,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ], @@ -4756,7 +4756,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -4776,7 +4776,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ], @@ -4796,7 +4796,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 83, 5 ], "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -4816,7 +4816,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ], @@ -4836,7 +4836,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "vac_sealer", 5 ], [ "makeshift_sealer", 10 ] ] ], @@ -4855,7 +4855,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "vac_sealer", 5 ], [ "makeshift_sealer", 10 ] ] ], @@ -4877,7 +4877,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 3, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -4897,7 +4897,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 1, - "time": 2750, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -4910,7 +4910,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 45000, + "time": "45 m", "charges": 15, "autolearn": true, "batch_time_factors": [ 83, 3 ], @@ -4935,7 +4935,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 45000, + "time": "45 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ], @@ -4948,7 +4948,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], @@ -4962,7 +4962,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], @@ -4976,7 +4976,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 20, + "time": "0 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "chem_ethanol", 125 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] @@ -4987,7 +4987,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 20, + "time": "0 m", "charges": 1, "autolearn": true, "flags": [ "BLIND_EASY" ], @@ -5010,7 +5010,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 20, + "time": "0 m", "charges": 1, "autolearn": true, "flags": [ "BLIND_EASY" ], @@ -5034,7 +5034,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 3, - "time": 7000, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "water_boiling_heat", 6, "LIST" ] ] ], @@ -5047,7 +5047,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 3, - "time": 7000, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "water_boiling_heat", 6, "LIST" ] ] ], @@ -5060,7 +5060,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 3, - "time": 7000, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], @@ -5073,7 +5073,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 5, - "time": 7000, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -5086,7 +5086,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 9000, + "time": "9 m", "charges": 2, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5125,7 +5125,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 1, - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5160,7 +5160,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 18000, + "time": "18 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5173,7 +5173,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 7500, + "time": "7 m", "book_learn": [ [ "cookbook_human", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5254,7 +5254,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 7500, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5322,7 +5322,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 9000, + "time": "9 m", "charges": 2, "book_learn": [ [ "cookbook_human", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5359,7 +5359,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 8000, + "time": "8 m", "charges": 2, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5396,7 +5396,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 3, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5414,7 +5414,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 3, - "time": 8000, + "time": "8 m", "book_learn": [ [ "cookbook_human", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5430,7 +5430,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -5442,7 +5442,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 1000, + "time": "1 m", "charges": 1, "autolearn": true, "batch_time_factors": [ 67, 5 ], @@ -5457,7 +5457,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5475,7 +5475,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5493,7 +5493,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 25000, + "time": "25 m", "charges": 4, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5519,7 +5519,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 25000, + "time": "25 m", "charges": 4, "book_learn": [ [ "cookbook_human", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5546,7 +5546,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5563,7 +5563,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 8000, + "time": "8 m", "book_learn": [ [ "cookbook_human", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5581,7 +5581,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 8000, + "time": "8 m", "book_learn": [ [ "cookbook_human", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5598,7 +5598,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 1750, + "time": "1 m", "charges": 1, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5612,7 +5612,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 8000, + "time": "8 m", "charges": 2, "book_learn": [ [ "cookbook_human", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5648,7 +5648,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5666,7 +5666,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 1, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5683,7 +5683,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 1, - "time": 8000, + "time": "8 m", "charges": 2, "book_learn": [ [ "cookbook_human", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5700,7 +5700,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5714,7 +5714,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5728,7 +5728,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5743,7 +5743,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5758,7 +5758,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5773,7 +5773,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "book_learn": [ [ "cookbook_human", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -5787,7 +5787,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 2500, + "time": "2 m", "charges": 1, "autolearn": true, "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5801,7 +5801,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 4, - "time": 45000, + "time": "45 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -5814,7 +5814,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 18000, + "time": "18 m", "charges": 2, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -5834,7 +5834,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -5876,7 +5876,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -5894,7 +5894,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -5913,7 +5913,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 5, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -5932,7 +5932,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 3, - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -5952,7 +5952,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -5973,7 +5973,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -5995,7 +5995,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "cookbook_human", 6 ] ], "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -6013,7 +6013,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -6026,7 +6026,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 2, - "time": 30000, + "time": "30 m", "charges": 8, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -6042,7 +6042,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ] ], @@ -6057,7 +6057,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ] ], @@ -6070,7 +6070,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 3, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -6091,7 +6091,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "components": [ @@ -6143,7 +6143,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 1000, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -6155,7 +6155,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 1000, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ @@ -6176,7 +6176,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 50, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -6190,7 +6190,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 3, - "time": 3500, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], @@ -6203,7 +6203,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 90000, + "time": "90 m", "book_learn": [ [ "recipe_creepy", 5 ], [ "recipe_serum", 6 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ @@ -6222,7 +6222,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -6240,7 +6240,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "result_mult": 2, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -6259,7 +6259,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6284,7 +6284,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6309,7 +6309,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6334,7 +6334,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6373,7 +6373,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "charges": 1, "autolearn": true, "contained": true, @@ -6400,7 +6400,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6425,7 +6425,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6451,7 +6451,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6513,7 +6513,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6560,7 +6560,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6607,7 +6607,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "contained": true, "batch_time_factors": [ 83, 5 ], "book_learn": [ [ "cookbook_human", 4 ] ], @@ -6655,7 +6655,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 24000, + "time": "24 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -6727,7 +6727,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], @@ -6742,7 +6742,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 3, - "time": 35000, + "time": "35 m", "charges": 3, "batch_time_factors": [ 50, 4 ], "autolearn": true, @@ -6769,7 +6769,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -6826,7 +6826,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 1500, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -6841,7 +6841,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 1500, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -6855,7 +6855,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", - "time": 1500, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -6869,7 +6869,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 1500, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -6883,7 +6883,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 1500, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -6897,7 +6897,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -6911,7 +6911,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 6 ], "difficulty": 5, - "time": 12000, + "time": "12 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_survival", 5 ], [ "atomic_survival", 4 ], [ "survival_book", 3 ] ], "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CUT", "level": 1 } ], @@ -6924,7 +6924,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 1500, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "tea", 1 ] ], [ [ "milk", 1 ], [ "milk_reconstituted", 1 ], [ "milk_powder", 1 ], [ "con_milk", 1 ] ] ] @@ -6935,7 +6935,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 1500, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ @@ -6950,7 +6950,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -6971,7 +6971,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 2, - "time": 3500, + "time": "3 m", "autolearn": true, "components": [ [ [ "gin", 1 ] ], [ [ "honeycomb", 1 ], [ "honey_bottled", 1 ] ], [ [ "lemonade", 1 ] ] ] }, @@ -6982,7 +6982,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 3000, + "time": "3 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "lemon", 1 ], [ "irradiated_lemon", 1 ] ], [ [ "whiskey", 1 ], [ "single_malt_whiskey", 1 ] ] ] @@ -6993,7 +6993,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", - "time": 3000, + "time": "3 m", "charges": 5, "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -7006,7 +7006,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 4000, + "time": "4 m", "charges": 15, "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -7024,7 +7024,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 4 ], "difficulty": 5, - "time": 15000, + "time": "15 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -7039,7 +7039,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 5, - "time": 7000, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "water_boiling_heat", 1, "LIST" ] ] ], @@ -7052,7 +7052,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "time": 40000, + "time": "40 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 12, "LIST" ] ] ], @@ -7070,7 +7070,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "rag", -1 ] ] ], @@ -7085,7 +7085,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 5, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], @@ -7100,7 +7100,7 @@ "skill_used": "cooking", "difficulty": 3, "skills_required": [ "tailor", 1 ], - "time": 30000, + "time": "30 m", "book_learn": [ [ "survival_book", 6 ], [ "scots_cookbook", 3 ] ], "batch_time_factors": [ 50, 4 ], "using": [ [ "sewing_standard", 2 ] ], @@ -7122,7 +7122,7 @@ "skill_used": "cooking", "difficulty": 3, "skills_required": [ "tailor", 1 ], - "time": 45000, + "time": "45 m", "book_learn": [ [ "survival_book", 6 ], [ "scots_cookbook", 3 ] ], "result_mult": 2, "batch_time_factors": [ 50, 4 ], @@ -7144,7 +7144,7 @@ "skill_used": "cooking", "difficulty": 3, "skills_required": [ "tailor", 1 ], - "time": 30000, + "time": "30 m", "charges": 2, "book_learn": [ [ "cookbook_human", 3 ] ], "batch_time_factors": [ 50, 4 ], @@ -7173,7 +7173,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 2, - "time": 12000, + "time": "12 m", "book_learn": [ [ "family_cookbook", 4 ], [ "scots_cookbook", 2 ] ], "batch_time_factors": [ 50, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 1 } ], @@ -7191,7 +7191,7 @@ "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", "difficulty": 3, - "time": 20000, + "time": "20 m", "charges": 5, "book_learn": [ [ "family_cookbook", 6 ], [ "scots_cookbook", 2 ] ], "batch_time_factors": [ 50, 4 ], @@ -7220,7 +7220,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "honey_bottled", 5 ] ], [ [ "sugar", 35 ] ] ] @@ -7232,7 +7232,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -7246,7 +7246,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "charges": 4, "book_learn": [ [ "family_cookbook", 2 ] ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 2 } ], @@ -7267,7 +7267,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 6, - "time": 5000, + "time": "5 m", "book_learn": [ [ "family_cookbook", 2 ] ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], @@ -7287,7 +7287,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "result_mult": 2, "qualities": [ { "id": "COOK", "level": 3 } ], @@ -7306,7 +7306,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "book_learn": [ [ "family_cookbook", 2 ] ], "charges": 6, "qualities": [ { "id": "COOK", "level": 3 } ], @@ -7329,7 +7329,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 11250, + "time": "11 m", "autolearn": true, "tools": [ [ [ "food_processor", 20 ] ] ], "components": [ [ [ "oats", 2 ] ] ] @@ -7342,7 +7342,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 11250, + "time": "11 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "food_processor", 20 ] ] ], @@ -7357,7 +7357,7 @@ "skill_used": "cooking", "difficulty": 2, "charges": 15, - "time": 11250, + "time": "11 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "food_processor", 20 ] ] ], @@ -7381,7 +7381,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "food_processor", 20 ] ] ], @@ -7395,7 +7395,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "food_processor", 20 ] ] ], @@ -7409,7 +7409,7 @@ "skill_used": "cooking", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": 10000, + "time": "10 m", "autolearn": true, "components": [ [ @@ -7433,7 +7433,7 @@ "skill_used": "cooking", "difficulty": 1, "skills_required": [ "survival", 1 ], - "time": 2000, + "time": "2 m", "autolearn": true, "components": [ [ @@ -7502,7 +7502,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "food_processor", 20 ] ] ], @@ -7516,7 +7516,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 11250, + "time": "11 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "food_processor", 20 ] ] ], @@ -7530,7 +7530,7 @@ "skill_used": "cooking", "difficulty": 4, "charges": 2, - "time": 70000, + "time": "70 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], @@ -7559,7 +7559,7 @@ "skill_used": "cooking", "difficulty": 4, "charges": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "batch_time_factors": [ 50, 3 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], @@ -7588,7 +7588,7 @@ "skill_used": "cooking", "skills_required": [ [ "survival", 1 ] ], "difficulty": 2, - "time": 67500, + "time": "67 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ], @@ -7604,7 +7604,7 @@ "skills_required": [ [ "survival", 1 ] ], "difficulty": 2, "charges": 15, - "time": 67500, + "time": "67 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], @@ -7630,7 +7630,7 @@ "skill_used": "cooking", "skills_required": [ [ "survival", 1 ] ], "difficulty": 2, - "time": 67500, + "time": "67 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ], @@ -7645,7 +7645,7 @@ "skill_used": "cooking", "skills_required": [ [ "survival", 1 ] ], "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], @@ -7661,7 +7661,7 @@ "skill_used": "cooking", "skills_required": [ [ "survival", 1 ] ], "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], @@ -7677,7 +7677,7 @@ "skill_used": "cooking", "difficulty": 3, "skills_required": [ "survival", 2 ], - "time": 67500, + "time": "67 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ], @@ -7690,7 +7690,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, - "time": 45000, + "time": "45 m", "charges": 3, "autolearn": false, "book_learn": [ [ "cookbook_human", 5 ] ], @@ -7726,7 +7726,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "time": 10000, + "time": "10 m", "charges": 4, "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], @@ -7741,7 +7741,7 @@ "skill_used": "cooking", "difficulty": 1, "charges": 3, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "food_processor", 40 ] ] ], @@ -7772,7 +7772,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -7790,7 +7790,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -7812,7 +7812,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -7835,7 +7835,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -7852,7 +7852,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "batch_time_factors": [ 83, 5 ], "autolearn": true, @@ -7875,7 +7875,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "batch_time_factors": [ 83, 5 ], "result_mult": 12, @@ -7897,7 +7897,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "batch_time_factors": [ 83, 5 ], "result_mult": 12, @@ -7918,7 +7918,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -7941,7 +7941,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 40000, + "time": "40 m", "result_mult": 12, "book_learn": [ [ "cookbook_human", 6 ] ], "batch_time_factors": [ 83, 5 ], @@ -7963,7 +7963,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 6, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -7985,7 +7985,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 5, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 83, 5 ], @@ -8031,7 +8031,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -8090,7 +8090,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -8135,7 +8135,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -8180,7 +8180,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -8251,7 +8251,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "book_learn": [ [ "cookbook_human", 4 ] ], "batch_time_factors": [ 80, 4 ], @@ -8296,7 +8296,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 40000, + "time": "40 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -8338,7 +8338,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 70000, + "time": "70 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -8357,7 +8357,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 70000, + "time": "70 m", "result_mult": 12, "book_learn": [ [ "cookbook_human", 4 ] ], "batch_time_factors": [ 80, 4 ], @@ -8375,7 +8375,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 120000, + "time": "120 m", "result_mult": 12, "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -8397,7 +8397,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -8416,7 +8416,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -8445,7 +8445,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 3, - "time": 30000, + "time": "30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -8465,7 +8465,7 @@ "skill_used": "cooking", "difficulty": 3, "autolearn": true, - "time": 40000, + "time": "40 m", "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -8494,7 +8494,7 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 3, "autolearn": true, - "time": 120000, + "time": "120 m", "result_mult": 12, "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ], "batch_time_factors": [ 80, 4 ], @@ -8526,7 +8526,7 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 3, "autolearn": true, - "time": 45000, + "time": "45 m", "result_mult": 2, "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ], "batch_time_factors": [ 80, 4 ], @@ -8555,7 +8555,7 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 3, "autolearn": true, - "time": 45000, + "time": "45 m", "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ], "contained": true, "batch_time_factors": [ 83, 5 ], @@ -8587,7 +8587,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 5, - "time": 10000, + "time": "10 m", "//": "Making the very first starter is a lot more finnicky than splitting it once it's mature.", "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -8600,7 +8600,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 1, - "time": 5000, + "time": "5 m", "result_mult": 2, "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -8614,7 +8614,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 2, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "COOK", "level": 3 } ], @@ -8628,7 +8628,7 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 2, - "time": 40000, + "time": "40 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 2147044dea41b..e1b03e84737d3 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -5,7 +5,7 @@ "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", "skill_used": "cooking", - "time": 1000, + "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], "components": [ [ [ "water_clean", 1 ], [ "water", 1 ] ], [ [ "salt", 10 ] ] ] @@ -18,7 +18,7 @@ "skill_used": "firstaid", "difficulty": 2, "skills_required": [ "cooking", 2 ], - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_firstaid", 2 ], [ "pocket_firstaid", 2 ], @@ -39,7 +39,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -54,7 +54,7 @@ "skill_used": "electronics", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -77,7 +77,7 @@ "skill_used": "cooking", "skills_required": [ "electronics", 1 ], "difficulty": 2, - "time": 10000, + "time": "10 m", "book_learn": [ [ "adv_chemistry", 1 ], [ "textbook_chemistry", 1 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "components": [ [ [ "salt_water", 1 ] ] ] @@ -89,7 +89,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], @@ -101,7 +101,7 @@ "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "autolearn": true, "reversible": true, "flags": [ "BLIND_HARD" ], @@ -114,7 +114,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], @@ -126,7 +126,7 @@ "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "autolearn": true, "reversible": true, "flags": [ "BLIND_HARD" ], @@ -139,7 +139,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 5, - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 5 ], [ "recipe_labchem", 5 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ], @@ -156,7 +156,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], @@ -170,7 +170,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_chemistry", 2 ], [ "adv_chemistry", 2 ], @@ -191,7 +191,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 2, - "time": 20000, + "time": "20 m", "book_learn": [ [ "pocket_survival", 3 ], [ "atomic_survival", 2 ], [ "textbook_survival", 2 ], [ "survival_book", 3 ] ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "meal_bone", 1 ] ], [ [ "water_clean", 1 ] ] ] @@ -204,7 +204,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "pocket_survival", 3 ], [ "atomic_survival", 2 ], [ "textbook_survival", 2 ], [ "survival_book", 3 ] ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "meal_bone", 1 ] ], [ [ "dry_fruit", 1 ], [ "sugar", 45 ] ], [ [ "water_clean", 1 ] ] ] @@ -217,7 +217,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_chemistry", 2 ], [ "adv_chemistry", 2 ], @@ -238,7 +238,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_chemistry", 2 ], [ "adv_chemistry", 2 ], @@ -259,7 +259,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 4, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 4 ], @@ -280,7 +280,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 6 ], @@ -306,7 +306,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 7 ], @@ -333,7 +333,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, - "time": 2000, + "time": "2 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -349,7 +349,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, - "time": 4000, + "time": "4 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -362,7 +362,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 7, - "time": 4000, + "time": "4 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 8 ], [ "atomic_survival", 7 ], [ "recipe_labchem", 7 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], @@ -375,7 +375,7 @@ "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 6 ], [ "recipe_labchem", 7 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -395,7 +395,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 8, - "time": 10000, + "time": "10 m", "book_learn": [ [ "textbook_gaswarfare", 8 ], [ "recipe_creepy", 8 ], @@ -429,7 +429,7 @@ "subcategory": "CSC_CHEM_MUTAGEN", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "jabberwock_heart", 1 ] ] ] @@ -442,7 +442,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_labchem", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -456,7 +456,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -474,7 +474,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -488,7 +488,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_maiar", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -506,7 +506,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -520,7 +520,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_maiar", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -534,7 +534,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -548,7 +548,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_maiar", 8 ], [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -562,7 +562,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ], [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -576,7 +576,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -594,7 +594,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -608,7 +608,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -626,7 +626,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -640,7 +640,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 7 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -654,7 +654,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -668,7 +668,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -682,7 +682,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -696,7 +696,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -724,7 +724,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -738,7 +738,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -752,7 +752,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -766,7 +766,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -780,7 +780,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -794,7 +794,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -808,7 +808,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -822,7 +822,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -840,7 +840,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_creepy", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -854,7 +854,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -868,7 +868,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -882,7 +882,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -896,7 +896,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -910,7 +910,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_maiar", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -924,7 +924,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -938,7 +938,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "recipe_medicalmut", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -978,7 +978,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_medicalmut", 9 ], [ "recipe_serum", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -991,7 +991,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "fabrication", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "note": "'stick the blob globs in a can and seal it' does not seem hugely challenging", "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1005,7 +1005,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, - "time": 10000, + "time": "10 m", "book_learn": [ [ "textbook_gaswarfare", 9 ], [ "atomic_survival", 9 ], @@ -1029,7 +1029,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_serum", 9 ], [ "recipe_labchem", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -1043,7 +1043,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_alpha", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], @@ -1062,7 +1062,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_alpha", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -1076,7 +1076,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, - "time": 12500, + "time": "12 m", "book_learn": [ [ "recipe_elfa", 10 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 31, "LIST" ] ] ], @@ -1090,7 +1090,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_elfa", 10 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -1104,7 +1104,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_chimera", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -1118,7 +1118,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_chimera", 8 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -1132,7 +1132,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, - "time": 12500, + "time": "12 m", "book_learn": [ [ "recipe_raptor", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 31, "LIST" ] ] ], @@ -1146,7 +1146,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, - "time": 15000, + "time": "15 m", "book_learn": [ [ "recipe_raptor", 9 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 37, "LIST" ] ] ], @@ -1160,7 +1160,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 6, - "time": 24000, + "time": "24 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ], [ "atomic_survival", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1174,7 +1174,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 7, - "time": 36000, + "time": "36 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 7 ], [ "recipe_labchem", 6 ], [ "atomic_survival", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1194,7 +1194,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 4, - "time": 24000, + "time": "24 m", "book_learn": [ [ "adv_chemistry", 2 ], [ "textbook_chemistry", 2 ], [ "recipe_labchem", 2 ], [ "atomic_survival", 3 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1207,7 +1207,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "cooking", "difficulty": 6, - "time": 24000, + "time": "24 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], @@ -1226,7 +1226,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 6, - "time": 24000, + "time": "24 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -1239,7 +1239,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 6, - "time": 36000, + "time": "36 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -1256,7 +1256,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 8, - "time": 12000, + "time": "12 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1269,7 +1269,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 180000, + "time": "180 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -1284,7 +1284,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 3, - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], @@ -1298,7 +1298,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "cooking", "difficulty": 3, - "time": 6000, + "time": "6 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ], [ "atomic_survival", 4 ] ], "using": [ [ "sewing_standard", 1 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -1313,7 +1313,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 3, - "time": 1200, + "time": "1 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 3 ] ], "tools": [ [ [ "surface_heat", 18, "LIST" ] ] ], "components": [ [ [ "meat_tainted", 1 ], [ "dry_meat_tainted", 1 ] ], [ [ "ammonia", 1 ] ] ] @@ -1326,7 +1326,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "survival", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "flags": [ "BLIND_HARD", "ALLOW_ROTTEN" ], @@ -1347,7 +1347,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 3, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "adv_chemistry", 2 ], [ "textbook_chemistry", 2 ], [ "recipe_labchem", 3 ], [ "atomic_survival", 2 ] ], "flags": [ "ALLOW_ROTTEN" ], @@ -1367,7 +1367,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ @@ -1384,7 +1384,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 6, - "time": 45000, + "time": "45 m", "book_learn": [ [ "recipe_creepy", 7 ], [ "recipe_serum", 7 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -1397,7 +1397,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 3, - "time": 45000, + "time": "45 m", "qualities": [ { "id": "CHEM", "level": 1 } ], "autolearn": true, "tools": [ [ [ "surface_heat", 18, "LIST" ] ] ], @@ -1416,7 +1416,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_chemistry", 2 ], [ "adv_chemistry", 2 ], @@ -1436,7 +1436,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 7, - "time": 25000, + "time": "25 m", "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_chemistry", 7 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1451,7 +1451,7 @@ "skill_used": "cooking", "skills_required": [ [ "firstaid", 3 ] ], "difficulty": 4, - "time": 6000, + "time": "6 m", "autolearn": true, "book_learn": [ [ "recipe_labchem", 3 ], [ "textbook_chemistry", 3 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 1 } ], @@ -1465,7 +1465,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 7, - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -1478,7 +1478,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 5, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], @@ -1492,7 +1492,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 6, - "time": 40000, + "time": "40 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 }, { "id": "DISTILL", "level": 1 } ], @@ -1506,7 +1506,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 5, - "time": 2500, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1520,7 +1520,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1534,7 +1534,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 5, - "time": 25000, + "time": "25 m", "book_learn": [ [ "textbook_anarch", 7 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 6 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -1549,7 +1549,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 40000, + "time": "40 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], @@ -1563,7 +1563,7 @@ "subcategory": "CSC_AMMO_COMPONENTS", "skill_used": "cooking", "difficulty": 4, - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ], [ "textbook_armschina", 5 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "chem_saltpetre", 150 ] ], [ [ "chem_sulphur", 20 ] ], [ [ "charcoal", 10 ], [ "coal_lump", 10 ] ] ] @@ -1577,7 +1577,7 @@ "skill_used": "fabrication", "skills_required": [ "cooking", 1 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_anarch", 4 ], [ "recipe_bullets", 2 ], @@ -1597,7 +1597,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 5, - "time": 180000, + "time": "180 m", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 7 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "chem_ammonium_nitrate", 90 ] ], [ [ "diesel", 500 ], [ "gasoline", 500 ] ] ] @@ -1609,7 +1609,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 4000, + "time": "4 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], @@ -1622,7 +1622,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 6, - "time": 30000, + "time": "30 m", "batch_time_factors": [ 67, 5 ], "book_learn": [ [ "recipe_labchem", 6 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ], @@ -1635,7 +1635,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 5, - "time": 15000, + "time": "15 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 5 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], @@ -1650,7 +1650,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 3, - "time": 10000, + "time": "10 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ], @@ -1665,7 +1665,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 60000, + "time": "60 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ], @@ -1679,7 +1679,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 7, - "time": 75000, + "time": "75 m", "book_learn": [ [ "recipe_labchem", 8 ], [ "textbook_anarch", 10 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], @@ -1692,7 +1692,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 } ], "components": [ [ [ "chem_aluminium_powder", 50 ] ], [ [ "chem_chromium_oxide", 50 ] ] ] @@ -1704,7 +1704,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 7, - "time": 55000, + "time": "55 m", "book_learn": [ [ "recipe_labchem", 8 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], "components": [ [ [ "chem_hexamine", 25 ] ], [ [ "chem_hydrogen_peroxide_conc", 5 ] ], [ [ "chem_acetic_acid", 2 ] ] ] @@ -1716,7 +1716,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 4, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_anarch", 5 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], "components": [ [ [ "chem_zinc_powder", 50 ] ], [ [ "chem_sulphur", 50 ] ], [ [ "superglue", 2 ] ] ] @@ -1728,7 +1728,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_anarch", 4 ], [ "recipe_labchem", 3 ], [ "textbook_chemistry", 5 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ], @@ -1742,7 +1742,7 @@ "skill_used": "survival", "difficulty": 2, "skills_required": [ "cooking", 1 ], - "time": 60000, + "time": "60 m", "batch_time_factors": [ 99, 1 ], "autolearn": true, "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -1757,7 +1757,7 @@ "skill_used": "firstaid", "difficulty": 3, "//": "This difficulty assumes that anaesthesia administration will be handled by the autodoc or the person using the kit. The included amount of ether is an estimate, based on average body size.", - "time": 2500, + "time": "2 m", "book_learn": [ [ "textbook_firstaid", 6 ], [ "emergency_book", 5 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ @@ -1772,7 +1772,7 @@ "subcategory": "CSC_CHEM_CHEMICALS", "skill_used": "cooking", "difficulty": 6, - "time": 80000, + "time": "80 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 7 ] ], "charges": 250, "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 918bc4542a434..a25b0c4370d15 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "skills_required": [ "traps", 1 ], "difficulty": 2, - "time": 100000, + "time": "100 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -21,7 +21,7 @@ "skill_used": "fabrication", "skills_required": [ "traps", 1 ], "difficulty": 1, - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "glass_shard", 3 ], [ "glass_sheet", 1 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ] ] @@ -33,7 +33,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", "difficulty": 4, - "time": 10000, + "time": "10 m", "autolearn": true, "tools": [ [ [ "con_mix", 50 ] ] ], "components": [ [ [ "material_cement", 50 ] ], [ [ "material_sand", 25 ] ], [ [ "pebble", 20 ] ] ] @@ -45,7 +45,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "nail", 8 ] ], [ [ "2x4", 3 ] ] ] @@ -56,7 +56,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", "skill_used": "tailor", - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], @@ -68,7 +68,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", "skill_used": "tailor", - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], @@ -81,7 +81,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 4 ], "difficulty": 4, - "time": 500000, + "time": "500 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -105,7 +105,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 4 ], "difficulty": 4, - "time": 550000, + "time": "550 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -138,7 +138,7 @@ "difficulty": 2, "book_learn": [ [ "fun_survival", 1 ], [ "manual_survival", 1 ], [ "textbook_survival", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ], - "time": 28000, + "time": "28 m", "autolearn": true, "components": [ [ [ "largebroketent", 1 ], [ "broketent", 2 ] ], [ [ "superglue", 2 ], [ "duct_tape", 20 ] ] ] }, @@ -152,7 +152,7 @@ "difficulty": 2, "book_learn": [ [ "fun_survival", 1 ], [ "manual_survival", 1 ], [ "textbook_survival", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ], - "time": 32000, + "time": "32 m", "autolearn": true, "components": [ [ [ "largebroketent", 2 ], [ "broketent", 4 ], [ "tent_kit", 3 ] ], [ [ "superglue", 3 ], [ "duct_tape", 40 ] ] ] }, @@ -164,7 +164,7 @@ "skill_used": "fabrication", "skills_required": [ "tailor", 1 ], "difficulty": 1, - "time": 15000, + "time": "15 m", "autolearn": true, "components": [ [ [ "soap", 5 ] ], [ [ "water_clean", 3 ] ], [ [ "wool_staple", 1 ] ] ] }, @@ -177,7 +177,7 @@ "skill_used": "fabrication", "skills_required": [ "traps", 2 ], "difficulty": 3, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], @@ -190,7 +190,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "cooking", "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], @@ -206,7 +206,7 @@ "skill_used": "cooking", "skills_required": [ [ "survival", 1 ] ], "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], @@ -220,7 +220,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -235,7 +235,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "mechanics", "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "book_icef", 3 ], [ "textbook_mechanics", 3 ], [ "textbook_carpentry", 3 ] ], @@ -250,7 +250,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -270,7 +270,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 90000, + "time": "90 m", "reversible": true, "decomp_learn": 3, "autolearn": true, @@ -291,7 +291,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 3 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_bullets", 6 ], [ "textbook_fabrication", 7 ] ], "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "swage", -1 ] ] ], @@ -305,7 +305,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 2 ], "difficulty": 5, - "time": 45000, + "time": "45 m", "book_learn": [ [ "manual_shotgun", 2 ], [ "manual_rifle", 2 ], [ "manual_smg", 2 ], [ "manual_pistol", 3 ], [ "recipe_bullets", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -318,7 +318,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "tailor", "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "soldering_standard", 5 ] ], @@ -338,7 +338,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "firstaid", "difficulty": 3, - "time": 2500, + "time": "2 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], @@ -351,7 +351,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 20000, + "time": "20 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -369,7 +369,7 @@ "skill_used": "electronics", "skills_required": [ "survival", 3 ], "difficulty": 2, - "time": 25000, + "time": "25 m", "autolearn": true, "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ], @@ -395,7 +395,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 45000, + "time": "45 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ @@ -418,7 +418,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ @@ -441,7 +441,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "textbook_mechanics", 3 ], [ "welding_book", 5 ] ], "using": [ [ "welding_standard", 4 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -454,7 +454,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 20000, + "time": "20 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "textbook_mechanics", 3 ], [ "welding_book", 5 ] ], "using": [ [ "welding_standard", 2 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -467,7 +467,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 24000, + "time": "24 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "textbook_mechanics", 3 ], [ "welding_book", 5 ] ], "using": [ [ "welding_standard", 2 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -480,7 +480,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 20000, + "time": "20 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 4 ] ], @@ -494,7 +494,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 10, - "time": 20000, + "time": "20 m", "reversible": true, "book_learn": [ [ "textbook_robots", 8 ] ], "using": [ [ "welding_standard", 5 ] ], @@ -509,7 +509,7 @@ "skill_used": "traps", "skills_required": [ "electronics", 8 ], "difficulty": 5, - "time": 4500, + "time": "4 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "recipe_lab_elec", 8 ] ], @@ -523,7 +523,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "rock", 1 ] ], [ [ "filament", 40, "LIST" ], [ "cordage_short", 2, "LIST" ] ] ] @@ -534,7 +534,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ @@ -550,7 +550,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ], [ "skewer_bone", 1 ] ] ] @@ -562,7 +562,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "splinter", 1 ] ] ] @@ -575,7 +575,7 @@ "skill_used": "survival", "difficulty": 3, "skills_required": [ "fabrication", 3 ], - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ] @@ -586,7 +586,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ @@ -602,7 +602,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ] ] @@ -615,7 +615,7 @@ "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "rock", 3 ] ], [ [ "cordage", 1, "LIST" ], [ "filament", 80, "LIST" ] ] ] @@ -628,7 +628,7 @@ "skill_used": "survival", "skills_required": [ "fabrication", 2 ], "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ @@ -644,7 +644,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 60000, + "time": "60 m", "reversible": true, "autolearn": true, "book_learn": [ [ "mag_survival", 1 ], [ "atomic_survival", 1 ], [ "textbook_carpentry", 2 ] ], @@ -664,7 +664,7 @@ "skill_used": "survival", "skills_required": [ "fabrication", 2 ], "difficulty": 3, - "time": 60000, + "time": "60 m", "autolearn": true, "book_learn": [ [ "mag_survival", 1 ], [ "atomic_survival", 1 ], [ "textbook_carpentry", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -682,7 +682,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 2 ], "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 } ], "components": [ @@ -698,7 +698,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "using": [ [ "cordage_short", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -711,7 +711,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "using": [ [ "cordage", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -724,7 +724,7 @@ "subcategory": "CSC_ELECTRONIC_TOOLS", "skill_used": "electronics", "difficulty": 1, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -737,7 +737,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skewer_bone", 2 ], [ "splinter", 2 ] ] ] @@ -749,7 +749,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ] ] ] @@ -761,7 +761,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 9000, + "time": "9 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 2 ], [ "2x4", 1 ] ], [ [ "skewer_bone", 20 ], [ "splinter", 20 ] ] ] @@ -774,7 +774,7 @@ "skill_used": "tailor", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -790,7 +790,7 @@ "skill_used": "tailor", "skills_required": [ "survival", 2 ], "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -806,7 +806,7 @@ "skill_used": "tailor", "skills_required": [ "survival", 2 ], "difficulty": 3, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -821,7 +821,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "jug_plastic", 1 ], [ "bottle_plastic", 3 ], [ "bottle_plastic_small", 6 ], [ "aluminum_foil", 6 ] ] ] @@ -834,7 +834,7 @@ "skill_used": "survival", "skills_required": [ "fabrication", 1 ], "difficulty": 2, - "time": 50000, + "time": "50 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -851,7 +851,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "survival", "skills_required": [ "tailor", 1 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ @@ -869,7 +869,7 @@ "skill_used": "survival", "skills_required": [ "tailor", 1 ], "difficulty": 1, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 0, "autolearn": true, @@ -884,7 +884,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": 7000, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "pipe", 1 ] ], [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 1 ] ] ] @@ -897,7 +897,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "rope_natural", 4 ], [ "welding_standard", 10 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -910,7 +910,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 1, "autolearn": true, @@ -924,7 +924,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 3, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 1, "autolearn": true, @@ -938,7 +938,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "mechanics", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "WRENCH", "level": 1 } ], @@ -951,7 +951,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "mechanics", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 5 ] ], @@ -965,7 +965,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 50 ], [ "welding_standard", 5 ] ], @@ -982,7 +982,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "id_suffix": "by hand", "skill_used": "tailor", - "time": 54000, + "time": "54 m", "autolearn": true, "byproducts": [ [ "seed_cotton_boll", 2 ] ], "components": [ [ [ "cotton_boll", 1 ] ] ] @@ -993,7 +993,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", - "time": 9000, + "time": "9 m", "autolearn": true, "byproducts": [ [ "seed_cotton_boll", 2 ] ], "tools": [ [ [ "carding_paddles", -1 ] ] ], @@ -1007,7 +1007,7 @@ "skill_used": "tailor", "difficulty": 1, "skills_required": [ "fabrication", 1 ], - "time": 9000, + "time": "9 m", "autolearn": true, "tools": [ [ [ "distaff_spindle", -1 ] ] ], "components": [ [ [ "cotton_ball", 3 ] ] ] @@ -1020,7 +1020,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", "difficulty": 2, - "time": 6000, + "time": "6 m", "autolearn": true, "using": [ [ "filament", 80 ] ], "qualities": [ { "id": "KNIT", "level": 1 } ] @@ -1031,7 +1031,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "time": 3000, + "time": "3 m", "autolearn": true, "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "rag_bloody", 1 ] ] ] @@ -1042,7 +1042,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", - "time": 10000, + "time": "10 m", "autolearn": true, "reversible": true, "using": [ [ "sewing_standard", 50 ] ], @@ -1055,7 +1055,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "mechanics", "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_fabrication", 5 ], [ "textbook_mechanics", 3 ], [ "manual_mechanics", 3 ] ], "using": [ [ "welding_standard", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -1068,7 +1068,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "mechanics", "difficulty": 5, - "time": 120000, + "time": "120 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "textbook_fabrication", 4 ], [ "manual_mechanics", 4 ], [ "textbook_mechanics", 4 ] ], @@ -1088,7 +1088,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "charges": 6, "flags": [ "BLIND_HARD" ], @@ -1100,7 +1100,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "components": [ [ [ "filament", 50, "LIST" ] ] ] @@ -1111,7 +1111,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "components": [ [ [ "string_6", 6 ], [ "filament", 300, "LIST" ] ] ] @@ -1123,7 +1123,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", - "time": 7500, + "time": "7 m", "reversible": true, "autolearn": true, "components": [ [ [ "string_36", 6 ], [ "string_6", 36 ] ] ] @@ -1136,7 +1136,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", "difficulty": 3, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 30 ], [ "leather", 30 ], [ "felt_patch", 30 ], [ "tanned_hide", 5 ] ] ] @@ -1147,7 +1147,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", - "time": 7500, + "time": "7 m", "reversible": true, "autolearn": true, "components": [ [ [ "rope_6", 5 ], [ "string_36", 30 ] ] ] @@ -1158,7 +1158,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "time": 7500, + "time": "7 m", "reversible": true, "autolearn": true, "components": [ [ [ "withered", 36 ], [ "straw_pile", 36 ] ] ] @@ -1169,7 +1169,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "time": 7500, + "time": "7 m", "reversible": true, "autolearn": true, "components": [ [ [ "rope_makeshift_6", 5 ], [ "withered", 180 ], [ "straw_pile", 180 ] ] ] @@ -1181,7 +1181,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 3, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -1194,7 +1194,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], @@ -1206,7 +1206,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "lighter", 5 ], [ "ref_lighter", 5 ], [ "surface_heat", 2, "LIST" ] ] ], @@ -1218,7 +1218,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "cordage_short", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -1230,7 +1230,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 3000, + "time": "3 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -1242,7 +1242,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "broadsword", 1 ], [ "machete", 1 ] ] ] @@ -1253,7 +1253,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "autolearn": true, "using": [ [ "steel_tiny", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -1267,7 +1267,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "forging_standard", 10 ], [ "steel_tiny", 2 ] ], "qualities": [ @@ -1287,7 +1287,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 6000, + "time": "6 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_W", "level": 1 } ], @@ -1300,7 +1300,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 3, - "time": 18000, + "time": "18 m", "book_learn": [ [ "textbook_fabrication", 3 ], [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ], [ "textbook_mechanics", 5 ] ], "using": [ [ "filament", 50 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -1314,7 +1314,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 50000, + "time": "50 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 5 ], [ "cutting_wire_standard", 1 ] ], @@ -1327,7 +1327,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 60000, + "time": "60 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 5 ], [ "cutting_wire_standard", 1 ] ], @@ -1340,7 +1340,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 35000, + "time": "35 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 2 ], [ "cutting_wire_standard", 1 ] ], @@ -1353,7 +1353,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 8000, + "time": "8 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 6 ] ], @@ -1366,7 +1366,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 9000, + "time": "9 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], @@ -1379,7 +1379,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 4 ] ], @@ -1393,7 +1393,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 4000, + "time": "4 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 2 ] ], @@ -1407,7 +1407,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 45000, + "time": "45 m", "reversible": true, "autolearn": true, "using": [ [ "steel_standard", 20 ] ], @@ -1424,7 +1424,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 90000, + "time": "90 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "GLARE", "level": 2 } ], @@ -1441,7 +1441,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 1, - "time": 6000, + "time": "6 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -1453,7 +1453,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", - "time": 4000, + "time": "4 m", "reversible": true, "autolearn": true, "using": [ [ "rope_natural_short", 3 ] ], @@ -1466,7 +1466,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 3, - "time": 6000, + "time": "6 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_W", "level": 1 } ], @@ -1479,7 +1479,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 4, - "time": 12000, + "time": "12 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_W", "level": 1 } ], @@ -1492,7 +1492,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 2, - "time": 6000, + "time": "6 m", "reversible": true, "autolearn": true, "using": [ [ "rope_natural_short", 2 ] ], @@ -1505,7 +1505,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 4, - "time": 12000, + "time": "12 m", "reversible": true, "note": "sawing it down doesn't teach anything useful", "autolearn": true, @@ -1520,7 +1520,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 4, - "time": 12000, + "time": "12 m", "reversible": true, "book_learn": [ [ "textbook_fabrication", 3 ], [ "welding_book", 3 ], [ "textbook_mechanics", 4 ] ], "qualities": [ { "id": "GLARE", "level": 2 } ], @@ -1535,7 +1535,7 @@ "skill_used": "fabrication", "difficulty": 6, "note": "hardened metal tools require high fabrication, so +1 diff here", - "time": 12000, + "time": "12 m", "reversible": true, "book_learn": [ [ "textbook_fabrication", 5 ], [ "adv_chemistry", 6 ], [ "welding_book", 5 ] ], "qualities": [ { "id": "GLARE", "level": 2 } ], @@ -1549,7 +1549,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 2 ] ] ] @@ -1560,7 +1560,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ] ] @@ -1572,7 +1572,7 @@ "subcategory": "CSC_OTHER_TRAPS", "skill_used": "traps", "difficulty": 1, - "time": 500, + "time": "0 m", "autolearn": true, "using": [ [ "cordage", 1 ] ], "components": [ [ [ "superglue", 1 ] ] ] @@ -1583,7 +1583,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TRAPS", "skill_used": "traps", - "time": 2500, + "time": "2 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -1596,7 +1596,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TRAPS", "skill_used": "traps", - "time": 250, + "time": "0 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -1610,7 +1610,7 @@ "skill_used": "traps", "skills_required": [ "mechanics", 3 ], "difficulty": 2, - "time": 3000, + "time": "3 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -1626,7 +1626,7 @@ "skill_used": "traps", "skills_required": [ "mechanics", 1 ], "difficulty": 3, - "time": 4500, + "time": "4 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -1641,7 +1641,7 @@ "skill_used": "traps", "skills_required": [ "mechanics", 1 ], "difficulty": 3, - "time": 5000, + "time": "5 m", "reversible": true, "decomp_learn": 2, "autolearn": true, @@ -1656,7 +1656,7 @@ "skill_used": "traps", "skills_required": [ "mechanics", 3 ], "difficulty": 4, - "time": 8000, + "time": "8 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "manual_mechanics", 3 ], [ "manual_traps", 3 ], [ "howto_traps", 3 ], [ "book_icef", 4 ] ], @@ -1671,7 +1671,7 @@ "subcategory": "CSC_OTHER_TRAPS", "skill_used": "traps", "difficulty": 3, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_traps", 2 ], [ "manual_traps", 3 ], [ "howto_traps", 3 ] ], "using": [ [ "cordage_short", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -1688,7 +1688,7 @@ "skill_used": "traps", "skills_required": [ "mechanics", 3 ], "difficulty": 5, - "time": 10000, + "time": "10 m", "reversible": true, "book_learn": [ [ "textbook_traps", 5 ], [ "manual_traps", 5 ], [ "howto_traps", 4 ], [ "recipe_bullets", 6 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -1723,7 +1723,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "sheet_metal", 1 ] ] ] @@ -1735,7 +1735,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "spike", -1 ], [ "sharp_rock", -1 ], [ "rebar", -1 ], [ "spear_rebar", -1 ] ] ], @@ -1748,7 +1748,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "spike", -1 ], [ "sharp_rock", -1 ], [ "rebar", -1 ], [ "spear_rebar", -1 ] ] ], @@ -1761,7 +1761,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "using": [ [ "welding_standard", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -1774,7 +1774,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 4, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "GLARE", "level": 2 } ], @@ -1788,7 +1788,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, - "time": 500, + "time": "0 m", "autolearn": true, "using": [ [ "welding_standard", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -1802,7 +1802,7 @@ "skill_used": "firstaid", "skills_required": [ "survival", 1 ], "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "components": [ [ [ "rag", 10 ], [ "medical_gauze", 4 ] ], @@ -1818,7 +1818,7 @@ "skill_used": "firstaid", "skills_required": [ "survival", 1 ], "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ [ "rag", 5 ], [ "medical_gauze", 2 ] ], @@ -1834,7 +1834,7 @@ "skill_used": "firstaid", "skills_required": [ "survival", 1 ], "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ [ "rag", 10 ], [ "medical_gauze", 4 ] ], @@ -1850,7 +1850,7 @@ "skill_used": "firstaid", "skills_required": [ "survival", 1 ], "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "components": [ [ [ "rag", 10 ], [ "medical_gauze", 4 ] ], @@ -1864,7 +1864,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 2500, + "time": "2 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -1878,7 +1878,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "duct_tape", 10 ] ], [ [ "bottle_plastic", 8 ], [ "bottle_plastic_small", 16 ] ] ] @@ -1890,7 +1890,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "cordage", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -1903,7 +1903,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "cordage", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], @@ -1917,7 +1917,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "using": [ [ "welding_standard", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -1930,7 +1930,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 3, - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ @@ -1948,7 +1948,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 1, - "time": 12000, + "time": "12 m", "autolearn": true, "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 3 ] ] ] @@ -1960,7 +1960,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "bowl_plastic", 4 ] ] ] @@ -1972,7 +1972,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 2 ] ] ] @@ -1984,7 +1984,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 1 ] ] ] @@ -1996,7 +1996,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 8 ] ] ] @@ -2008,7 +2008,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "skills_required": [ "cooking", 2 ], - "time": 2000, + "time": "2 m", "reversible": true, "decomp_learn": 0, "flags": [ "BLIND_EASY" ], @@ -2027,7 +2027,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "skills_required": [ "cooking", 2 ], - "time": 3000, + "time": "3 m", "reversible": true, "decomp_learn": 0, "flags": [ "BLIND_HARD" ], @@ -2041,7 +2041,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 2000, + "time": "2 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 1 ] ], @@ -2054,7 +2054,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "mechanics", "difficulty": 1, - "time": 2000, + "time": "2 m", "reversible": true, "book_learn": [ [ "manual_shotgun", 0 ], @@ -2085,7 +2085,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 1 ], [ "cooking", 2 ] ], "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "book_learn": [ [ "atomic_survival", 1 ], [ "textbook_survival", 1 ], [ "cookbook", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -2098,7 +2098,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "mechanics", "difficulty": 2, - "time": 12000, + "time": "12 m", "reversible": true, "decomp_learn": 2, "autolearn": [ [ "mechanics", 3 ], [ "electronics", 2 ] ], @@ -2113,7 +2113,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 20000, + "time": "20 m", "book_learn": [ [ "fun_survival", 1 ], [ "manual_fabrication", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "can_drink_unsealed", 2 ] ], [ [ "bottle_plastic", 1 ] ] ] @@ -2125,7 +2125,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 180000, + "time": "180 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -2157,7 +2157,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 240000, + "time": "240 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ], @@ -2170,7 +2170,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 240000, + "time": "240 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 } ], "tools": [ [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2183,7 +2183,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 45000, + "time": "45 m", "autolearn": true, "tools": [ [ [ "brick_kiln", 90 ], [ "kiln", 90 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 5 ] ] ] @@ -2195,7 +2195,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 } ], "tools": [ [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ], @@ -2208,7 +2208,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 45000, + "time": "45 m", "reversible": true, "note": "melting the chisel back down seems unlikely to teach anything useful", "autolearn": true, @@ -2230,7 +2230,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 120000, + "time": "120 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 4 ], @@ -2250,7 +2250,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], @@ -2263,7 +2263,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 140000, + "time": "140 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], @@ -2276,7 +2276,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -2289,7 +2289,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2303,7 +2303,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "press", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], @@ -2318,7 +2318,7 @@ "skill_used": "cooking", "difficulty": 4, "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "electrolysis_kit", 10 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], @@ -2336,7 +2336,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2349,7 +2349,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2363,7 +2363,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2376,7 +2376,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 300000, + "time": "300 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], @@ -2389,7 +2389,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 300000, + "time": "300 m", "autolearn": true, "using": [ [ "forging_standard", 5 ], [ "steel_tiny", 1 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -2403,7 +2403,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 320000, + "time": "320 m", "autolearn": true, "using": [ [ "forging_standard", 10 ], [ "steel_standard", 1 ] ], "book_learn": [ [ "manual_mechanics", 3 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], @@ -2419,7 +2419,7 @@ "skill_used": "fabrication", "difficulty": 6, "note": "not so much the engineering as hardening the edge", - "time": 380000, + "time": "380 m", "autolearn": true, "using": [ [ "forging_standard", 15 ], [ "steel_standard", 2 ] ], "book_learn": [ [ "manual_mechanics", 4 ], [ "manual_fabrication", 4 ], [ "textbook_fabrication", 4 ] ], @@ -2434,7 +2434,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 280000, + "time": "280 m", "autolearn": true, "using": [ [ "forging_standard", 10 ], [ "steel_standard", 2 ] ], "book_learn": [ [ "manual_fabrication", 2 ], [ "textbook_fabrication", 3 ] ], @@ -2449,7 +2449,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 7, - "time": 320000, + "time": "320 m", "autolearn": true, "using": [ [ "forging_standard", 15 ], [ "steel_standard", 4 ] ], "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], @@ -2463,7 +2463,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 320000, + "time": "320 m", "autolearn": true, "using": [ [ "forging_standard", 10 ], [ "steel_standard", 2 ] ], "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], @@ -2478,7 +2478,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 360000, + "time": "360 m", "autolearn": true, "using": [ [ "forging_standard", 15 ], [ "steel_standard", 3 ] ], "book_learn": [ [ "textbook_fabrication", 4 ] ], @@ -2493,7 +2493,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 7, - "time": 420000, + "time": "420 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -2507,7 +2507,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 460000, + "time": "460 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -2521,7 +2521,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 6, - "time": 520000, + "time": "520 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ @@ -2539,7 +2539,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 20 ], [ "oxy_torch", 4 ] ] ], @@ -2552,7 +2552,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "mechanics", "difficulty": 5, - "time": 25000, + "time": "25 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "textbook_mechanics", 5 ], [ "textbook_carpentry", 5 ], [ "book_icef", 6 ] ], @@ -2572,7 +2572,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], @@ -2586,7 +2586,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], @@ -2599,7 +2599,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "time": 10000, + "time": "10 m", "autolearn": true, "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ] ] ] @@ -2612,7 +2612,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 4, - "time": 1200, + "time": "1 m", "book_learn": [ [ "textbook_firstaid", 3 ], [ "adv_chemistry", 4 ], [ "emergency_book", 4 ] ], "qualities": [ { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 18, "LIST" ] ] ], @@ -2626,7 +2626,7 @@ "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 6, - "time": 1200, + "time": "1 m", "book_learn": [ [ "textbook_firstaid", 8 ], [ "textbook_chemistry", 7 ], [ "adv_chemistry", 6 ], [ "emergency_book", 8 ] ], "qualities": [ { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 18, "LIST" ] ] ], @@ -2639,7 +2639,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 120000, + "time": "120 m", "book_learn": [ [ "textbook_fabrication", 4 ], [ "textbook_weapeast", 5 ], @@ -2669,7 +2669,7 @@ "skill_used": "fabrication", "skills_required": [ "cooking", 2 ], "difficulty": 2, - "time": 70000, + "time": "70 m", "reversible": true, "decomp_learn": 1, "book_learn": [ [ "textbook_fabrication", 2 ], [ "manual_fabrication", 3 ], [ "cookbook", 3 ] ], @@ -2689,7 +2689,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 150000, + "time": "150 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ], @@ -2702,7 +2702,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 150000, + "time": "150 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ], @@ -2715,7 +2715,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 120000, + "time": "120 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 4 ], [ "manual_fabrication", 4 ] ], "using": [ [ "welding_standard", 15 ] ], @@ -2734,7 +2734,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 180000, + "time": "180 m", "reversible": true, "decomp_learn": 4, "autolearn": true, @@ -2763,7 +2763,7 @@ "skill_used": "fabrication", "skills_required": [ [ "electronics", 3 ] ], "difficulty": 7, - "time": 150000, + "time": "150 m", "reversible": true, "autolearn": true, "book_learn": [ [ "textbook_fabrication", 7 ], [ "manual_fabrication", 7 ] ], @@ -2790,7 +2790,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2803,7 +2803,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 90000, + "time": "90 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 2 ], [ "manual_fabrication", 2 ] ], "qualities": [ @@ -2822,7 +2822,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "components": [ [ @@ -2845,7 +2845,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ], [ [ "charcoal", 75 ] ] ] @@ -2857,7 +2857,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 3, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], "components": [ [ [ "2x4", 30 ] ], [ [ "scrap", 6 ] ] ] @@ -2870,7 +2870,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 8, - "time": 420000, + "time": "420 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 400 ], [ "oxy_torch", 80 ] ] ], @@ -2884,7 +2884,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 8, - "time": 262500, + "time": "262 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 40 ] ] ], @@ -2898,7 +2898,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 8, - "time": 42000, + "time": "42 m", "autolearn": true, "using": [ [ "welding_standard", 15 ] ], "components": [ [ [ "sheet_metal", 3 ], [ "sheet_metal_small", 72 ] ] ] @@ -2911,7 +2911,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 8, - "time": 26250, + "time": "26 m", "autolearn": true, "using": [ [ "welding_standard", 10 ] ], "components": [ [ [ "sheet_metal", 2 ], [ "sheet_metal_small", 48 ] ] ] @@ -2923,7 +2923,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 8, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "soldering_standard", 40 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -2935,7 +2935,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 1 ] ], @@ -2951,7 +2951,7 @@ "skill_used": "fabrication", "skills_required": [ "cooking", 4 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "book_learn": [ [ "glassblowing_book", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ @@ -2975,7 +2975,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 7, - "time": 90000, + "time": "90 m", "book_learn": [ [ "glassblowing_book", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 150 ] ] ], @@ -2988,7 +2988,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 6, - "time": 60000, + "time": "60 m", "book_learn": [ [ "glassblowing_book", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 75 ] ] ], @@ -3001,7 +3001,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 5, - "time": 40000, + "time": "40 m", "book_learn": [ [ "glassblowing_book", 4 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 50 ] ] ], @@ -3014,7 +3014,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 20000, + "time": "20 m", "book_learn": [ [ "glassblowing_book", 4 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ], @@ -3027,7 +3027,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 4000, + "time": "4 m", "book_learn": [ [ "glassblowing_book", 4 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 5 ] ] ], @@ -3040,7 +3040,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 30000, + "time": "30 m", "book_learn": [ [ "glassblowing_book", 5 ] ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 75 ] ] ], "components": [ [ [ "glass_sheet", 1 ] ], [ [ "silver_small", 10 ] ] ] @@ -3053,7 +3053,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "polisher", 20 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 50 ] ] ], @@ -3066,7 +3066,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 60000, + "time": "60 m", "book_learn": [ [ "glassblowing_book", 6 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ], @@ -3079,7 +3079,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 3, - "time": 60000, + "time": "60 m", "autolearn": true, "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "sheet_metal", -1 ] ], [ [ "forge", 75 ] ] ], "components": [ [ [ "glass_shard", 16 ], [ "flask_glass", 4 ], [ "jar_glass", 2 ] ] ] @@ -3091,7 +3091,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_survival", 4 ], [ "atomic_survival", 3 ], [ "textbook_survival", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "rope_30", 1 ], [ "vine_30", 1 ], [ "rope_6", 5 ] ], [ [ "scrap", 4 ] ] ] @@ -3103,7 +3103,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", "difficulty": 5, - "time": 90000, + "time": "90 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 4 ], [ "manual_fabrication", 4 ] ], "qualities": [ @@ -3122,7 +3122,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 6 ] ], @@ -3136,7 +3136,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 6, - "time": 120000, + "time": "120 m", "qualities": [ { "id": "CUT", "level": 1 } ], "book_learn": [ [ "recipe_caseless", 5 ] ], "components": [ @@ -3150,7 +3150,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -3164,7 +3164,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 1, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -3185,7 +3185,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ] @@ -3197,7 +3197,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "survival", "difficulty": 2, - "time": 10000, + "time": "10 m", "book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 2 ], [ "survival_book", 1 ], [ "pocket_survival", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -3212,7 +3212,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "tailor", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "using": [ [ "filament", 20 ], [ "cordage_short", 1 ] ], "components": [ [ [ "rag", 2 ] ] ] @@ -3224,7 +3224,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "tailor", "difficulty": 3, - "time": 50000, + "time": "50 m", "autolearn": true, "using": [ [ "filament", 80 ], [ "cordage", 1 ] ], "components": [ [ [ "rag", 12 ] ] ] @@ -3237,7 +3237,7 @@ "skill_used": "fabrication", "skills_required": [ "cooking", 2 ], "difficulty": 3, - "time": 60000, + "time": "60 m", "batch_time_factors": [ 75, 4 ], "autolearn": true, "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], @@ -3251,7 +3251,7 @@ "skill_used": "fabrication", "skills_required": [ "cooking", 3 ], "difficulty": 4, - "time": 90000, + "time": "90 m", "autolearn": true, "batch_time_factors": [ 75, 3 ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], @@ -3264,7 +3264,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 5, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -3278,7 +3278,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 2 ], "difficulty": 5, - "time": 15000, + "time": "15 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 3 ] ], [ [ "cable", 2 ] ] ] @@ -3291,7 +3291,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 4 ], "difficulty": 5, - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "sheet_metal", -1 ] ] ], @@ -3305,7 +3305,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 3 ], "difficulty": 4, - "time": 4000, + "time": "4 m", "reversible": true, "autolearn": true, "components": [ @@ -3328,7 +3328,7 @@ "skill_used": "firstaid", "skills_required": [ "fabrication", 2 ], "difficulty": 4, - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "syringe", 1 ] ], [ [ "flask_glass", 1 ], [ "bottle_plastic_small", 1 ] ] ] @@ -3340,7 +3340,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "cooking", "difficulty": 5, - "time": 50000, + "time": "50 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], "result_mult": 15, @@ -3355,7 +3355,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 4, - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -3368,7 +3368,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 3000, + "time": "3 m", "autolearn": true, "components": [ [ [ "charcoal", 5 ], [ "coal_lump", 5 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ] @@ -3380,7 +3380,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 10000, + "time": "10 m", "autolearn": true, "tools": [ [ [ "surface_heat", 4, "LIST" ] ], [ [ "mold_plastic", -1 ] ] ], "components": [ [ [ "bag_plastic", 3 ] ] ] @@ -3392,7 +3392,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 10000, + "time": "10 m", "autolearn": true, "tools": [ [ [ "surface_heat", 6, "LIST" ], [ "soldering_iron", 10 ] ] ], "components": [ [ [ "cash_card", 4 ] ] ] @@ -3404,7 +3404,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 4, - "time": 40000, + "time": "40 m", "reversible": true, "autolearn": true, "components": [ [ [ "chitin_piece", 20 ] ], [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ], [ "adhesive", 4, "LIST" ] ] ] @@ -3416,7 +3416,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 5, - "time": 55000, + "time": "55 m", "reversible": true, "autolearn": true, "components": [ [ [ "acidchitin_piece", 25 ] ], [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ], [ "adhesive", 4, "LIST" ] ] ] @@ -3428,7 +3428,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "fabrication", "difficulty": 3, - "time": 40000, + "time": "40 m", "reversible": true, "autolearn": true, "components": [ @@ -3443,7 +3443,7 @@ "subcategory": "CSC_WEAPON_PARTS", "skill_used": "fabrication", "difficulty": 6, - "time": 360000, + "time": "360 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], @@ -3456,7 +3456,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 6, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -3469,7 +3469,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -3483,7 +3483,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 2 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "using": [ [ "soldering_standard", 25 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -3496,7 +3496,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 3 ] ], @@ -3510,7 +3510,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 3 ] ], @@ -3524,7 +3524,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 3 ] ] ] @@ -3537,7 +3537,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 45000, + "time": "45 m", "autolearn": true, "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 15 ] ] ] @@ -3550,7 +3550,7 @@ "skill_used": "tailor", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 60 ] ], "components": [ [ [ "leather", 4 ], [ "tanned_hide", 1 ], [ "fur", 4 ], [ "tanned_pelt", 1 ] ] ] @@ -3563,7 +3563,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "chunk_sulfur", 1 ] ] ] @@ -3576,7 +3576,7 @@ "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -3592,7 +3592,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "difficulty": 1, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "cured_pelt", 1 ] ] ] @@ -3605,7 +3605,7 @@ "skill_used": "survival", "skills_required": [ "cooking", 2 ], "difficulty": 3, - "time": 48000, + "time": "48 m", "batch_time_factors": [ 20, 10 ], "autolearn": true, "qualities": [ @@ -3631,7 +3631,7 @@ "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], [ [ "raw_fur", 50 ], [ "raw_tainted_fur", 50 ] ] ] @@ -3644,7 +3644,7 @@ "skill_used": "survival", "skills_required": [ "cooking", 2 ], "difficulty": 3, - "time": 48000, + "time": "48 m", "batch_time_factors": [ 20, 10 ], "autolearn": true, "qualities": [ @@ -3671,7 +3671,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 3 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 50, 5 ], "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 5 ], [ "modern_tanner", 4 ] ], "qualities": [ @@ -3692,7 +3692,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 3 ], "difficulty": 4, - "time": 20000, + "time": "20 m", "batch_time_factors": [ 50, 5 ], "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 5 ], [ "modern_tanner", 4 ] ], "qualities": [ @@ -3711,7 +3711,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 9, - "time": 440000, + "time": "440 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 8 ], [ "textbook_fabrication", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -3725,7 +3725,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "2x4", 1 ], [ "stick", 1 ], [ "broom", 1 ] ] ] @@ -3737,7 +3737,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 1 ] ], [ [ "2x4", 1 ], [ "stick", 1 ], [ "broom", 1 ] ] ] @@ -3750,7 +3750,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 45000, + "time": "45 m", "autolearn": true, "tools": [ [ [ "brick_kiln", 90 ], [ "kiln", 90 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 5 ] ] ] @@ -3763,7 +3763,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "tools": [ [ [ "brick_kiln", 75 ], [ "kiln", 75 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 4 ] ] ] @@ -3776,7 +3776,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 50000, + "time": "50 m", "autolearn": true, "tools": [ [ [ "brick_kiln", 100 ], [ "kiln", 100 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 8 ] ] ] @@ -3789,7 +3789,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "tools": [ [ [ "brick_kiln", 40 ], [ "kiln", 40 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 3 ] ] ] @@ -3801,7 +3801,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": 40000, + "time": "40 m", "autolearn": true, "batch_time_factors": [ 75, 4 ], "tools": [ [ [ "brick_kiln", 60 ], [ "kiln", 60 ] ] ], @@ -3814,7 +3814,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", "difficulty": 2, - "time": 10000, + "time": "10 m", "autolearn": true, "tools": [ [ [ "con_mix", 50 ] ] ], "components": [ [ [ "material_cement", 50 ] ], [ [ "material_sand", 150 ] ] ] @@ -3826,7 +3826,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "components": [ [ [ "pot", 1 ], [ "pot_copper", 1 ], [ "clay_pot", 1 ], [ "rock_pot", 1 ] ], [ [ "oil_cooker", 1 ] ] ] @@ -3838,7 +3838,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], @@ -3851,7 +3851,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "components": [ [ [ "oil_lamp", 1 ] ], [ [ "pilot_light", 1 ] ], [ [ "scrap", 3 ] ], [ [ "duct_tape", 50 ] ] ] @@ -3863,7 +3863,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "components": [ [ [ "gasoline_lantern", 1 ] ], [ [ "pilot_light", 1 ] ], [ [ "scrap", 3 ] ], [ [ "duct_tape", 50 ] ] ] @@ -3875,7 +3875,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", "difficulty": 5, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ @@ -3891,7 +3891,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], @@ -3904,7 +3904,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ], @@ -3918,7 +3918,7 @@ "skill_used": "fabrication", "skills_required": [ "tailor", 4 ], "difficulty": 6, - "time": 60000, + "time": "60 m", "book_learn": [ [ "scots_cookbook", 3 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ @@ -3935,7 +3935,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "using": [ [ "cordage_short", 2 ] ], @@ -3954,7 +3954,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "using": [ [ "cordage_short", 4 ] ], @@ -3967,7 +3967,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "components": [ [ [ "dogbane", 1 ], [ "cattail_stalk", 1 ] ] ] }, @@ -3978,7 +3978,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "mechanics", "difficulty": 5, - "time": 10000, + "time": "10 m", "book_learn": [ [ "textbook_mechanics", 4 ] ], "reversible": true, "using": [ [ "welding_standard", 5 ] ], @@ -3992,7 +3992,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "mechanics", "difficulty": 5, - "time": 10000, + "time": "10 m", "book_learn": [ [ "textbook_mechanics", 4 ] ], "reversible": true, "using": [ [ "welding_standard", 5 ] ], @@ -4006,7 +4006,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "mechanics", "difficulty": 5, - "time": 10000, + "time": "10 m", "book_learn": [ [ "textbook_mechanics", 4 ] ], "reversible": true, "using": [ [ "welding_standard", 5 ] ], @@ -4020,7 +4020,7 @@ "subcategory": "CSC_OTHER_PARTS", "skill_used": "mechanics", "difficulty": 5, - "time": 10000, + "time": "10 m", "book_learn": [ [ "textbook_mechanics", 4 ] ], "reversible": true, "using": [ [ "welding_standard", 5 ] ], @@ -4034,7 +4034,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "cooking", "difficulty": 5, - "time": 25000, + "time": "25 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "hotplate", 100 ], [ "toolset", 100 ] ] ], @@ -4054,7 +4054,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "tailor", "difficulty": 3, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 3 } ], "components": [ [ [ "sewing_kit", 1 ], [ "tailors_kit", 1 ] ] ] @@ -4066,7 +4066,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 1 ] ] ] @@ -4077,7 +4077,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "time": 15000, + "time": "15 m", "autolearn": true, "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "splinter", 5 ], [ "2x4", 1 ], [ "stick", 1 ] ] ] @@ -4090,7 +4090,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": 5000, + "time": "5 m", "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "wire", 1 ] ] ] @@ -4103,7 +4103,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 3, - "time": 60000, + "time": "60 m", "book_learn": [ [ "textbook_armwest", 2 ], [ "textbook_fabrication", 2 ], [ "recipe_melee", 2 ] ], "using": [ [ "chainmail_standard", 1 ] ], "components": [ [ [ "chain_link", 1000 ] ], [ [ "wire", 1 ] ] ] @@ -4116,7 +4116,7 @@ "skill_used": "fabrication", "skill_required": [ "tailor", 1 ], "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "using": [ [ "filament", 8 ] ], "qualities": [ { "id": "SEW", "level": 1 } ], @@ -4131,7 +4131,7 @@ "skill_used": "fabrication", "skill_required": [ "tailor", 1 ], "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "using": [ [ "filament", 8 ] ], "qualities": [ { "id": "SEW", "level": 1 } ], @@ -4146,7 +4146,7 @@ "skill_used": "fabrication", "skill_required": [ "tailor", 1 ], "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "using": [ [ "filament", 8 ] ], "qualities": [ { "id": "SEW", "level": 1 } ], @@ -4160,7 +4160,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 2 ], [ "textbook_mechanics", 3 ] ], "qualities": [ @@ -4186,7 +4186,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 2 ], [ "textbook_mechanics", 3 ] ], "qualities": [ @@ -4211,7 +4211,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", "difficulty": 4, - "time": 8000, + "time": "8 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 2 ], [ "textbook_mechanics", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "DRILL", "level": 1 }, { "id": "SCREW", "level": 1 } ], @@ -4224,7 +4224,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "tailor", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 30 ] ], @@ -4236,7 +4236,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", "skill_used": "tailor", - "time": 60000, + "time": "60 m", "reversible": true, "autolearn": true, "components": [ [ [ "withered", 12 ], [ "straw_pile", 12 ], [ "willowbark", 6 ], [ "birchbark", 6 ] ], [ [ "plant_fibre", 100 ] ] ] @@ -4248,7 +4248,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "welding_standard", 30 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ], @@ -4262,7 +4262,7 @@ "skill_used": "fabrication", "difficulty": 5, "book_learn": [ [ "textbook_chemistry", 5 ], [ "textbook_fabrication", 4 ] ], - "time": 120000, + "time": "120 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "electrolysis_kit", 10 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], @@ -4280,7 +4280,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "time": 45000, + "time": "45 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -4294,7 +4294,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 4, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ], @@ -4306,7 +4306,7 @@ "category": "CC_OTHER", "subcategory": "CSC_AMMO_OTHER", "skill_used": "fabrication", - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "splinter", 1 ] ] ] @@ -4317,7 +4317,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "DIG", "level": 3 } ], "components": [ [ [ "bag_canvas", 1 ] ], [ [ "material_sand", 60 ] ] ] @@ -4328,7 +4328,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "DIG", "level": 3 } ], "components": [ [ [ "bag_canvas", 1 ] ], [ [ "material_soil", 3 ] ] ] diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json index 49f111c827c1b..6a0a03b3e3d2c 100644 --- a/data/json/recipes/recipe_vehicle.json +++ b/data/json/recipes/recipe_vehicle.json @@ -6,7 +6,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "fabrication", "difficulty": 6, - "time": 240000, + "time": "240 m", "reversible": true, "autolearn": false, "book_learn": [ [ "textbook_fabrication", 5 ], [ "welding_book", 6 ], [ "textbook_carpentry", 5 ] ], @@ -33,7 +33,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "fabrication", "difficulty": 1, - "time": 10000, + "time": "10 m", "autolearn": true, "using": [ [ "welding_standard", 10 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -46,7 +46,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "fabrication", "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "book_learn": [ [ "textbook_fabrication", 5 ], [ "welding_book", 6 ], [ "textbook_carpentry", 5 ] ], "using": [ [ "welding_standard", 2 ] ], @@ -61,7 +61,7 @@ "//": "sawing it down doesn't teach anything useful", "skill_used": "fabrication", "difficulty": 2, - "time": 8000, + "time": "8 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 10 ] ], @@ -75,7 +75,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "fabrication", "difficulty": 6, - "time": 15000, + "time": "15 m", "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 10 ] ], @@ -88,7 +88,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "fabrication", "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "welding_standard", 10 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ], @@ -107,7 +107,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "mechanics", "difficulty": 5, - "time": 180000, + "time": "180 m", "reversible": true, "autolearn": false, "book_learn": [ [ "textbook_mechanics", 5 ], [ "manual_mechanics", 5 ], [ "textbook_fabrication", 5 ] ], @@ -151,12 +151,37 @@ "skill_used": "fabrication", "skill_required": [ "mechanics", 2 ], "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "using": [ [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "large_space_heater", 1 ] ], [ [ "wire", 2 ] ] ] }, + { + "result": "mountable_cooler", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "mechanics", + "difficulty": 5, + "time": 180000, + "reversible": true, + "autolearn": false, + "book_learn": [ [ "textbook_mechanics", 5 ], [ "manual_mechanics", 5 ], [ "textbook_fabrication", 5 ] ], + "using": [ [ "welding_standard", 20 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "components": [ + [ [ "sheet_metal", 2 ] ], + [ [ "condensor_coil", 2 ] ], + [ [ "evaporator_coil", 2 ] ], + [ [ "thermostat", 1 ] ], + [ [ "motor_tiny", 1 ] ], + [ [ "refrigerant_tank", 1 ] ], + [ [ "plastic_chunk", 8 ] ], + [ [ "wire", 2 ] ], + [ [ "fan", 1 ] ] + ] + }, { "result": "washing_machine", "type": "recipe", @@ -165,7 +190,7 @@ "skill_used": "fabrication", "skill_required": [ "mechanics", 5 ], "difficulty": 5, - "time": 170000, + "time": "170 m", "book_learn": [ [ "textbook_fabrication", 6 ], [ "textbook_mechanics", 5 ] ], "using": [ [ "welding_standard", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 }, { "id": "DRILL", "level": 2 } ], @@ -189,7 +214,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "fabrication", "difficulty": 5, - "time": 90000, + "time": "90 m", "autolearn": true, "using": [ [ "welding_standard", 4 ], [ "steel_tiny", 4 ] ], "tools": [ [ [ "mold_plastic", -1 ] ] ], @@ -203,7 +228,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "mechanics", "difficulty": 1, - "time": 3000, + "time": "3 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "WRENCH", "level": 2 } ], @@ -221,7 +246,7 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 4, "autolearn": true, - "time": 60000, + "time": "60 m", "using": [ [ "welding_standard", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "sheet_metal", 3 ] ], [ [ "clockworks", 2 ] ] ] diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 34670aca13cd1..3d8663e435ce0 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -5,7 +5,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "components": [ [ [ "duct_tape", 50 ] ], [ [ "blade", 1 ] ] ] @@ -16,7 +16,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "components": [ [ [ "duct_tape", 100 ] ], [ [ "blade", 1 ] ], [ [ "stick_long", 1 ] ] ] @@ -28,7 +28,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 2, - "time": 10000, + "time": "10 m", "reversible": true, "decomp_learn": 1, "autolearn": true, @@ -43,7 +43,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 6, - "time": 460000, + "time": "460 m", "autolearn": true, "using": [ [ "forging_standard", 15 ], [ "steel_standard", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -57,7 +57,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 1, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -73,7 +73,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], @@ -88,7 +88,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", - "time": 800, + "time": "0 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ], [ "broom", 1 ], [ "pool_cue", 1 ] ] ] @@ -101,7 +101,7 @@ "skill_used": "survival", "skills_required": [ "fabrication", 1 ], "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ] ] @@ -112,7 +112,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ] ] ] @@ -123,7 +123,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", - "time": 100000, + "time": "100 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "rebar", 1 ] ] ] @@ -134,7 +134,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -148,7 +148,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 1, - "time": 3000, + "time": "3 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 3 ] ] @@ -159,7 +159,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", - "time": 3000, + "time": "3 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "hose", 1 ] ] ] @@ -171,7 +171,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 6, - "time": 180000, + "time": "180 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -185,7 +185,7 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 2000, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "fire", -1 ] ] ], @@ -202,7 +202,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 3, - "time": 2400, + "time": "2 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], @@ -222,11 +222,10 @@ "skill_used": "fabrication", "skills_required": [ "survival", 1 ], "difficulty": 2, - "time": 2600, + "time": "2 m", "autolearn": true, - "//": "Hammer to kinda shape the spikes for stable attachment--no forge used", - "qualities": [ { "id": "HAMMER", "level": 1 } ], "//": "Extra duct tape/string needed to attach the spikes; rag/leather for grip.", + "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "stick_long", 1 ], [ "pool_cue", 1 ] ], [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], @@ -242,7 +241,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 1 ], [ "stabbing", 1 ] ], "difficulty": 3, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ], "components": [ @@ -260,7 +259,7 @@ "skill_used": "fabrication", "skills_required": [ [ "survival", 1 ], [ "throw", 2 ] ], "difficulty": 3, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "fire", -1 ] ] ], @@ -278,7 +277,7 @@ "skill_used": "fabrication", "skills_required": [ "throw", 2 ], "difficulty": 2, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -290,7 +289,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ @@ -308,7 +307,7 @@ "skill_used": "fabrication", "skills_required": [ "archery", 3 ], "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 1, "autolearn": true, @@ -324,7 +323,7 @@ "skill_used": "fabrication", "skills_required": [ "archery", 3 ], "difficulty": 8, - "time": 40000, + "time": "40 m", "reversible": true, "decomp_learn": 1, "book_learn": [ [ "manual_archery", 6 ], [ "recipe_bows", 5 ], [ "book_archery", 7 ] ], @@ -338,7 +337,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "skills_required": [ "survival", 1 ], - "time": 12000, + "time": "12 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -352,7 +351,7 @@ "skill_used": "fabrication", "skills_required": [ "archery", 1 ], "difficulty": 2, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 1, "autolearn": true, @@ -368,7 +367,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 7 ] ], "difficulty": 5, - "time": 25000, + "time": "25 m", "book_learn": [ [ "recipe_bows", 6 ], [ "manual_archery", 7 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -385,7 +384,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 2 ] ], "difficulty": 4, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "recipe_bows", 4 ], [ "manual_archery", 5 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -403,7 +402,7 @@ "skill_used": "fabrication", "skills_required": [ [ "mechanics", 2 ] ], "difficulty": 5, - "time": 30000, + "time": "30 m", "book_learn": [ [ "recipe_bows", 6 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "SAW_M_FINE", "level": 1 } ], "components": [ @@ -423,7 +422,7 @@ "skills_required": [ [ "mechanics", 4 ] ], "using": [ [ "forging_standard", 4 ] ], "difficulty": 7, - "time": 240000, + "time": "240 m", "book_learn": [ [ "recipe_bows", 8 ], [ "welding_book", 7 ], [ "textbook_mechanics", 7 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, @@ -452,7 +451,7 @@ "skills_required": [ [ "mechanics", 5 ] ], "using": [ [ "forging_standard", 10 ] ], "difficulty": 10, - "time": 240000, + "time": "240 m", "book_learn": [ [ "recipe_bows", 9 ], [ "welding_book", 8 ], [ "textbook_mechanics", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, @@ -478,7 +477,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "nail", 6 ] ] ] @@ -489,7 +488,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 8 ] ], @@ -501,7 +500,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "bat", 1 ] ], [ [ "nail", 6 ] ] ] @@ -512,7 +511,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "components": [ [ [ "bat", 1 ] ], [ [ "wire_barbed", 1 ] ] ] @@ -523,7 +522,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "components": [ [ [ "bowling_pin", 1 ] ], [ [ "spike", 2 ] ], [ [ "duct_tape", 100 ] ] ] @@ -536,7 +535,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 3 ] ], "difficulty": 3, - "time": 60000, + "time": "60 m", "autolearn": true, "book_learn": [ [ "manual_shotgun", 2 ], [ "manual_pistol", 2 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], @@ -565,7 +564,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 3 ] ], "difficulty": 4, - "time": 90000, + "time": "90 m", "autolearn": true, "book_learn": [ [ "manual_pistol", 3 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], @@ -589,7 +588,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 5, - "time": 120000, + "time": "120 m", "autolearn": true, "book_learn": [ [ "manual_pistol", 5 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], @@ -614,10 +613,9 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 5, - "time": 180000, - "//": "Three hours to remove the action, preserve the old stock, install the action in the new stock, and prep it for use", - "autolearn": true, + "time": "180 m", "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", + "autolearn": true, "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], "components": [ [ [ "mosin91_30_ebr", 1 ] ], [ [ "mn_classic_kit", 1 ] ] ] }, @@ -630,10 +628,9 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 5, - "time": 180000, - "//": "Three hours to remove the action, preserve the old stock, install the action in the new stock, and prep it for use", - "autolearn": true, + "time": "180 m", "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", + "autolearn": true, "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], "components": [ [ [ "mosin44_ebr", 1 ] ], [ [ "mn_classic_kit", 1 ] ] ] }, @@ -646,10 +643,9 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 5, - "time": 180000, - "//": "Three hours to remove the action, preserve the old stock, install the action in the new stock, and prep it for use", - "autolearn": true, + "time": "180 m", "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", + "autolearn": true, "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], "components": [ [ [ "mosin91_30", 1 ] ], [ [ "mn_ebr_kit", 1 ] ] ] }, @@ -662,10 +658,9 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 5, - "time": 180000, - "//": "Three hours to remove the action, preserve the old stock, install the action in the new stock, and prep it for use", - "autolearn": true, + "time": "180 m", "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", + "autolearn": true, "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], "components": [ [ [ "mosin44", 1 ] ], [ [ "mn_ebr_kit", 1 ] ] ] }, @@ -677,11 +672,10 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 5, - "time": 90000, - "//": "90 minutes to set up", + "time": "90 m", + "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", "reversible": true, "autolearn": true, - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], "components": [ [ [ "l_base_223", 1 ] ], [ [ "l_car_223_kit", 1 ] ] ] }, @@ -693,7 +687,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 5, - "time": 95000, + "time": "95 m", "reversible": true, "autolearn": true, "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", @@ -708,7 +702,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 6 ] ], "difficulty": 6, - "time": 120000, + "time": "120 m", "reversible": true, "autolearn": true, "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", @@ -723,11 +717,10 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 5 ] ], "difficulty": 7, - "time": 100000, - "//": "Should be 100 minutes", + "time": "100 m", + "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", "reversible": true, "autolearn": true, - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], "components": [ [ [ "l_base_223", 1 ] ], [ [ "l_lmg_223_kit", 1 ] ] ] }, @@ -738,7 +731,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "recipe_bows", 3 ], [ "manual_archery", 5 ], [ "book_archery", 4 ] ], @@ -757,7 +750,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 2, "book_learn": [ @@ -778,7 +771,7 @@ "skill_used": "fabrication", "skills_required": [ [ "mechanics", 3 ] ], "difficulty": 5, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "recipe_bows", 5 ], [ "manual_archery", 6 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], @@ -797,7 +790,7 @@ "skills_required": [ [ "mechanics", 5 ] ], "using": [ [ "forging_standard", 4 ] ], "difficulty": 7, - "time": 240000, + "time": "240 m", "book_learn": [ [ "recipe_bows", 9 ], [ "welding_book", 8 ], [ "textbook_mechanics", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, @@ -824,7 +817,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "decomp_learn": 2, "book_learn": [ [ "recipe_bows", 1 ], [ "manual_archery", 3 ], [ "book_archery", 2 ] ], @@ -838,7 +831,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "mechanics", "difficulty": 1, - "time": 12000, + "time": "12 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -852,7 +845,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -866,7 +859,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 2, - "time": 12000, + "time": "12 m", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "pipe", 1 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 2 ] ] ] @@ -879,7 +872,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 2, - "time": 12000, + "time": "12 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -893,7 +886,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 18000, + "time": "18 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -907,7 +900,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 5 ], "difficulty": 7, - "time": 270000, + "time": "270 m", "autolearn": true, "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, @@ -935,7 +928,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 14000, + "time": "14 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -949,7 +942,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 3 ], "difficulty": 5, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -964,7 +957,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 5 ], "difficulty": 7, - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "welding_standard", 30 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], @@ -979,7 +972,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 4 ], "difficulty": 6, - "time": 240000, + "time": "240 m", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, @@ -1007,7 +1000,7 @@ "skill_used": "mechanics", "skills_required": [ "launcher", 4 ], "difficulty": 7, - "time": 240000, + "time": "240 m", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, @@ -1035,7 +1028,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 3 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -1055,7 +1048,7 @@ "skill_used": "mechanics", "skills_required": [ "launcher", 3 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -1070,7 +1063,7 @@ "skill_used": "mechanics", "skills_required": [ "launcher", 3 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "manual_launcher", 3 ], [ "mag_launcher", 4 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "pipe", 1 ] ], [ [ "duct_tape", 50 ] ], [ [ "nail", 1 ] ] ] @@ -1081,7 +1074,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_RANGED", "skill_used": "launcher", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "decomp_learn": 0, @@ -1095,7 +1088,7 @@ "skill_used": "mechanics", "skills_required": [ "shotgun", 3 ], "difficulty": 6, - "time": 20000, + "time": "20 m", "book_learn": [ [ "manual_shotgun", 4 ], [ "mag_shotgun", 5 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], "components": [ [ [ "pipe", 2 ] ], [ [ "duct_tape", 75 ] ], [ [ "nail", 2 ] ] ] @@ -1108,7 +1101,7 @@ "skill_used": "mechanics", "skills_required": [ "fabrication", 3 ], "difficulty": 6, - "time": 18000, + "time": "18 m", "reversible": true, "decomp_learn": 5, "autolearn": true, @@ -1130,7 +1123,7 @@ "skill_used": "mechanics", "skills_required": [ "melee", 2 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "textbook_mechanics", 4 ], [ "recipe_melee", 5 ] ], "using": [ [ "welding_standard", 10 ] ], @@ -1150,7 +1143,7 @@ "skill_used": "mechanics", "skills_required": [ "melee", 2 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "textbook_mechanics", 4 ], [ "recipe_melee", 5 ] ], "using": [ [ "welding_standard", 10 ] ], @@ -1170,7 +1163,7 @@ "skill_used": "electronics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 25000, + "time": "25 m", "reversible": true, "book_learn": [ [ "advanced_electronics", 3 ], [ "textbook_electronics", 3 ], [ "textbook_anarch", 4 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], @@ -1184,7 +1177,7 @@ "subcategory": "CSC_WEAPON_MODS", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rope_6", 1 ], [ "rag", 3 ], [ "string_36", 6 ] ] ] @@ -1196,7 +1189,7 @@ "subcategory": "CSC_WEAPON_MODS", "skill_used": "fabrication", "difficulty": 1, - "time": 500, + "time": "0 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 1 ] ], @@ -1210,7 +1203,7 @@ "skill_used": "fabrication", "skills_required": [ "gun", 1 ], "difficulty": 9, - "time": 55000, + "time": "55 m", "book_learn": [ [ "welding_book", 7 ], [ "recipe_melee", 5 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ], [ "tongs", -1 ] ], [ [ "forge", 475 ], [ "oxy_torch", 95 ] ] ], @@ -1223,7 +1216,7 @@ "subcategory": "CSC_WEAPON_MODS", "skill_used": "fabrication", "difficulty": 1, - "time": 500, + "time": "0 m", "reversible": true, "autolearn": true, "using": [ [ "cordage_short", 2 ] ], @@ -1237,7 +1230,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 1, - "time": 650, + "time": "0 m", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], "components": [ [ [ "rag", 4 ], [ "plastic_chunk", 4 ], [ "felt_patch", 4 ], [ "leather", 4 ] ], [ [ "pipe", 1 ] ] ] @@ -1250,7 +1243,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 8, - "time": 60000, + "time": "60 m", "autolearn": true, "tools": [ [ [ "large_repairkit", 250 ] ] ], "components": [ [ [ "scrap", 1 ] ], [ [ "pipe", 2 ] ] ] @@ -1263,7 +1256,7 @@ "skill_used": "tailor", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 65000, + "time": "65 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], @@ -1277,7 +1270,7 @@ "skill_used": "fabrication", "skills_required": [ [ "gun", 3 ] ], "difficulty": 5, - "time": 25000, + "time": "25 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], @@ -1312,7 +1305,7 @@ "skill_used": "fabrication", "skills_required": [ [ "gun", 3 ] ], "difficulty": 4, - "time": 25000, + "time": "25 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], [ "manual_shotgun", 4 ], [ "manual_smg", 4 ], [ "manual_rifle", 4 ] ], "qualities": [ @@ -1341,7 +1334,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 3 ] ], "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "textbook_mechanics", 3 ], [ "manual_pistol", 4 ], @@ -1360,7 +1353,7 @@ "skill_used": "fabrication", "skills_required": [ [ "gun", 2 ] ], "difficulty": 4, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 2 ], [ "manual_rifle", 3 ], [ "manual_launcher", 3 ] ], "qualities": [ @@ -1389,7 +1382,7 @@ "skill_used": "fabrication", "skills_required": [ [ "gun", 3 ] ], "difficulty": 5, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], @@ -1411,7 +1404,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 4 ] ], "difficulty": 8, - "time": 60000, + "time": "60 m", "book_learn": [ [ "textbook_mechanics", 4 ], [ "manual_shotgun", 5 ], [ "manual_rifle", 5 ] ], "tools": [ [ [ "large_repairkit", 150 ] ], [ [ "swage", -1 ] ] ], "components": [ [ [ "pipe", 1 ] ] ] @@ -1424,7 +1417,7 @@ "skill_used": "fabrication", "skills_required": [ [ "gun", 3 ] ], "difficulty": 6, - "time": 15000, + "time": "15 m", "autolearn": true, "book_learn": [ [ "textbook_mechanics", 3 ], @@ -1446,7 +1439,7 @@ "skill_used": "fabrication", "skills_required": [ [ "gun", 3 ] ], "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], [ "manual_pistol", 4 ] ], "qualities": [ @@ -1475,7 +1468,7 @@ "skill_used": "fabrication", "skills_required": [ [ "gun", 3 ] ], "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], @@ -1510,7 +1503,7 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 3 ] ], "difficulty": 6, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "textbook_mechanics", 3 ], @@ -1531,7 +1524,7 @@ "skill_used": "fabrication", "skills_required": [ [ "rifle", 3 ] ], "difficulty": 5, - "time": 140000, + "time": "140 m", "//": "Pipe/sheet metal is to add trip to non M16-style carriers, since both types are in civilian AR's.", "book_learn": [ [ "manual_rifle", 5 ], [ "textbook_anarch", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "DRILL", "level": 1 } ], @@ -1550,7 +1543,7 @@ "skill_used": "fabrication", "skills_required": [ [ "rifle", 3 ] ], "difficulty": 4, - "time": 60000, + "time": "60 m", "//": "Simple to manufacture, hence it's not gonna be in published in too much detail in gun-mags.", "book_learn": [ [ "manual_rifle", 6 ], [ "textbook_anarch", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], @@ -1565,7 +1558,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 2 ] ], "difficulty": 3, - "time": 10000, + "time": "10 m", "autolearn": true, "book_learn": [ [ "manual_gun", 3 ], [ "mag_archery", 2 ], [ "manual_archery", 1 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -1580,7 +1573,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 3 ] ], "difficulty": 3, - "time": 5000, + "time": "5 m", "autolearn": true, "book_learn": [ [ "mag_archery", 3 ], [ "manual_archery", 2 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -1595,7 +1588,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 1 ] ], "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "book_learn": [ [ "mag_archery", 2 ], [ "manual_archery", 1 ] ], "using": [ [ "soldering_standard", 5 ] ], @@ -1609,7 +1602,7 @@ "subcategory": "CSC_WEAPON_MODS", "skill_used": "fabrication", "difficulty": 4, - "time": 35000, + "time": "35 m", "book_learn": [ [ "recipe_bows", 3 ], [ "manual_archery", 5 ], [ "book_archery", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 }, @@ -1632,7 +1625,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 25000, + "time": "25 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 2 ], [ "stick", 4 ] ] ] @@ -1644,7 +1637,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 2, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "sword_wood", 1 ] ], [ [ "nail", 12 ] ] ] @@ -1656,7 +1649,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "mechanics", "difficulty": 1, - "time": 10000, + "time": "10 m", "reversible": true, "decomp_learn": 3, "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], @@ -1669,7 +1662,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "mechanics", "difficulty": 4, - "time": 20000, + "time": "20 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], @@ -1683,7 +1676,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "mechanics", "difficulty": 5, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], @@ -1697,7 +1690,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "mechanics", "difficulty": 5, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], @@ -1711,7 +1704,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "mechanics", "difficulty": 5, - "time": 30000, + "time": "30 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], @@ -1726,7 +1719,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 2 ], "difficulty": 6, - "time": 160000, + "time": "160 m", "autolearn": true, "using": [ [ "welding_standard", 15 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], @@ -1746,7 +1739,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 2 ], "difficulty": 7, - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "welding_standard", 20 ] ], "qualities": [ @@ -1772,7 +1765,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 3 ], "difficulty": 8, - "time": 180000, + "time": "180 m", "autolearn": true, "using": [ [ "welding_standard", 30 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], @@ -1792,7 +1785,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 3 ], "difficulty": 8, - "time": 240000, + "time": "240 m", "book_learn": [ [ "recipe_mininuke_launch", 5 ] ], "using": [ [ "welding_standard", 20 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], @@ -1812,7 +1805,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 2 ], "difficulty": 3, - "time": 180000, + "time": "180 m", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 2 ] ], "qualities": [ @@ -1832,7 +1825,7 @@ "skill_used": "electronics", "skills_required": [ "mechanics", 6 ], "difficulty": 9, - "time": 360000, + "time": "360 m", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, @@ -1857,7 +1850,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "survival", "difficulty": 1, - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "spray_can", 1 ] ], [ [ "duct_tape", 25 ] ], [ [ "lighter", 1 ] ] ] @@ -1870,7 +1863,7 @@ "skill_used": "fabrication", "skills_required": [ "bashing", 1 ], "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "rag", 4 ] ], [ [ "scrap", 4 ] ] ] @@ -1883,7 +1876,7 @@ "skill_used": "fabrication", "skills_required": [ "bashing", 1 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "book_learn": [ [ "recipe_melee", 3 ], [ "textbook_weapeast", 8 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "2x4", 4 ], [ "stick", 8 ] ], [ [ "rebar", 5 ] ] ] @@ -1894,7 +1887,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "using": [ [ "cordage", 4 ] ], @@ -1909,7 +1902,7 @@ "skill_used": "fabrication", "skills_required": [ "bashing", 1 ], "difficulty": 2, - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_melee", 1 ], [ "textbook_weapeast", 7 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "leather", 4 ] ], [ [ "scrap", 8 ] ] ] @@ -1921,7 +1914,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 6, - "time": 300000, + "time": "300 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], @@ -1934,7 +1927,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 4, - "time": 360000, + "time": "360 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], @@ -1951,7 +1944,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 4, - "time": 240000, + "time": "240 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], @@ -1964,7 +1957,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 6, - "time": 360000, + "time": "360 m", "book_learn": [ [ "manual_knives", 4 ], [ "recipe_melee", 5 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], @@ -1977,7 +1970,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 6, - "time": 390000, + "time": "390 m", "book_learn": [ [ "manual_knives", 4 ], [ "recipe_melee", 5 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], @@ -1990,7 +1983,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 4, - "time": 390000, + "time": "390 m", "book_learn": [ [ "manual_knives", 3 ], [ "recipe_melee", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], @@ -2003,7 +1996,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 360000, + "time": "360 m", "book_learn": [ [ "manual_knives", 9 ], [ "textbook_weapeast", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 400 ], [ "oxy_torch", 80 ] ] ], @@ -2016,7 +2009,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 4, - "time": 240000, + "time": "240 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], @@ -2029,7 +2022,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 3, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, @@ -2048,7 +2041,7 @@ "skill_used": "fabrication", "skills_required": [ "throw", 1 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], @@ -2061,7 +2054,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 8, - "time": 460000, + "time": "460 m", "autolearn": true, "book_learn": [ [ "manual_knives", 5 ], [ "recipe_melee", 5 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -2075,7 +2068,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 7, - "time": 360000, + "time": "360 m", "autolearn": true, "book_learn": [ [ "manual_knives", 5 ], [ "recipe_melee", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -2089,7 +2082,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 4, - "time": 90000, + "time": "90 m", "autolearn": true, "book_learn": [ [ "manual_knives", 3 ], [ "recipe_melee", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -2103,7 +2096,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 4, - "time": 15000, + "time": "15 m", "autolearn": true, "components": [ [ [ "q_staff", 1 ] ], [ [ "duct_tape", 200 ] ], [ [ "chainsaw_off", 2 ] ] ] }, @@ -2114,7 +2107,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 4, - "time": 15000, + "time": "15 m", "autolearn": true, "components": [ [ [ "q_staff", 1 ] ], [ [ "duct_tape", 200 ] ], [ [ "elec_chainsaw_off", 2 ] ] ] }, @@ -2125,7 +2118,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 9, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_fireman", 8 ], [ "textbook_fabrication", 9 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2138,7 +2131,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 6, - "time": 460000, + "time": "460 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], @@ -2151,7 +2144,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 7, - "time": 260000, + "time": "260 m", "book_learn": [ [ "manual_knives", 3 ], [ "recipe_melee", 5 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 350 ], [ "oxy_torch", 70 ] ] ], @@ -2163,7 +2156,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "flags": [ "BLIND_EASY" ], @@ -2177,7 +2170,7 @@ "skill_used": "electronics", "skills_required": [ "fabrication", 4, "gun", 2 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "recipe_lab_elec", 5 ] ], "qualities": [ { "id": "SCREW_FINE", "level": 1 } ], "tools": [ [ [ "soldering_standard", 20, "LIST" ], [ "small_repairkit", 20 ], [ "large_repairkit", 10 ] ] ], @@ -2197,7 +2190,7 @@ "skill_used": "fabrication", "skills_required": [ "melee", 1 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "book_learn": [ [ "recipe_melee", 4 ] ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "plastic_chunk", 10 ] ] ] @@ -2210,7 +2203,7 @@ "skill_used": "fabrication", "skills_required": [ "bashing", 3 ], "difficulty": 4, - "time": 30000, + "time": "30 m", "book_learn": [ [ "recipe_melee", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ] @@ -2223,7 +2216,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 6, - "time": 45000, + "time": "45 m", "book_learn": [ [ "recipe_melee", 5 ] ], "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -2243,7 +2236,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "skills_required": [ ], - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "tools": [ ], @@ -2256,7 +2249,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 2, - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "sword_wood", 1 ] ], [ [ "scrap", 4 ] ] ] @@ -2268,7 +2261,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 7, - "time": 400000, + "time": "400 m", "book_learn": [ [ "textbook_weapwest", 6 ], [ "scots_cookbook", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], @@ -2285,7 +2278,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_weapwest", 7 ], [ "scots_cookbook", 9 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 425 ], [ "oxy_torch", 85 ] ] ], @@ -2302,7 +2295,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_weapwest", 7 ], [ "scots_cookbook", 9 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 400 ], [ "oxy_torch", 80 ] ] ], @@ -2319,7 +2312,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_weapwest", 8 ], [ "recipe_melee", 7 ], [ "scots_cookbook", 9 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 400 ], [ "oxy_torch", 80 ] ] ], @@ -2336,7 +2329,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 7, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_weapwest", 8 ], [ "recipe_melee", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 350 ], [ "oxy_torch", 70 ] ] ], @@ -2349,7 +2342,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 9, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_weapwest", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2366,7 +2359,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_armschina", 7 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 425 ], [ "oxy_torch", 85 ] ] ], @@ -2384,7 +2377,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_armschina", 7 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2401,7 +2394,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 8, - "time": 490000, + "time": "490 m", "book_learn": [ [ "textbook_weapwest", 7 ], [ "scots_cookbook", 9 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2418,7 +2411,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_weapwest", 7 ], [ "scots_cookbook", 9 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2435,7 +2428,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 9, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_weapwest", 8 ], [ "scots_cookbook", 10 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2453,7 +2446,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 7, - "time": 340000, + "time": "340 m", "book_learn": [ [ "textbook_weapeast", 6 ] ], "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ], "//": "Bokken is a single piece of wood, and the heavy stick just isn't large enough.", @@ -2471,7 +2464,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 7, - "time": 380000, + "time": "380 m", "book_learn": [ [ "textbook_weapeast", 6 ], [ "manual_knives", 7 ], [ "recipe_melee", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 310 ], [ "oxy_torch", 70 ] ] ], @@ -2488,7 +2481,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_weapeast", 7 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 400 ], [ "oxy_torch", 80 ] ] ], @@ -2505,7 +2498,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 9, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_weapeast", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2522,7 +2515,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 10, - "time": 580000, + "time": "580 m", "book_learn": [ [ "textbook_weapeast", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 500 ], [ "oxy_torch", 100 ] ] ], @@ -2539,7 +2532,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 4, - "time": 180000, + "time": "180 m", "book_learn": [ [ "textbook_weapwest", 3 ], [ "recipe_melee", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], @@ -2556,7 +2549,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 6, - "time": 240000, + "time": "240 m", "book_learn": [ [ "textbook_weapwest", 5 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], @@ -2573,7 +2566,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 7, - "time": 360000, + "time": "360 m", "book_learn": [ [ "textbook_weapwest", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 350 ], [ "oxy_torch", 70 ] ] ], @@ -2591,7 +2584,7 @@ "skill_used": "fabrication", "skills_required": [ "bashing", 2 ], "difficulty": 2, - "time": 18000, + "time": "18 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "leather", 2 ] ] ] @@ -2603,7 +2596,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 3, - "time": 24000, + "time": "24 m", "autolearn": true, "book_learn": [ [ "textbook_weapwest", 2 ], [ "recipe_melee", 3 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ], @@ -2617,7 +2610,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 5, - "time": 480000, + "time": "480 m", "book_learn": [ [ "textbook_weapeast", 9 ], [ "recipe_melee", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], @@ -2631,7 +2624,7 @@ "skill_used": "fabrication", "skills_required": [ "electronics", 3 ], "difficulty": 3, - "time": 15000, + "time": "15 m", "reversible": true, "book_learn": [ [ "textbook_electronics", 3 ], [ "advanced_electronics", 3 ], [ "recipe_melee", 4 ] ], "using": [ [ "soldering_standard", 10 ] ], @@ -2645,7 +2638,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 3, - "time": 15000, + "time": "15 m", "autolearn": true, "components": [ [ [ "q_staff", 1 ] ], [ [ "duct_tape", 100 ] ], [ [ "blade", 2 ] ] ] }, @@ -2656,7 +2649,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 6, - "time": 60000, + "time": "60 m", "reversible": true, "decomp_learn": 5, "book_learn": [ [ "recipe_bows", 6 ], [ "textbook_weapwest", 6 ] ], @@ -2684,7 +2677,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 3, - "time": 45000, + "time": "45 m", "reversible": true, "decomp_learn": 4, "book_learn": [ [ "recipe_bows", 4 ], [ "textbook_weapeast", 6 ] ], @@ -2698,7 +2691,7 @@ "skill_used": "fabrication", "skills_required": [ "launcher", 3 ], "difficulty": 3, - "time": 10000, + "time": "10 m", "autolearn": true, "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "2x4", 2 ], [ "stick", 2 ] ], [ [ "scrap", 1 ] ] ] @@ -2711,7 +2704,7 @@ "skill_used": "fabrication", "skills_required": [ ], "difficulty": 1, - "time": 8000, + "time": "8 m", "reversible": true, "autolearn": true, "using": [ [ "adhesive", 1 ] ], @@ -2726,7 +2719,7 @@ "skill_used": "electronics", "skills_required": [ "gun", 1 ], "difficulty": 5, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -2739,7 +2732,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 3, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], @@ -2752,7 +2745,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 6, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2765,7 +2758,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 7, - "time": 460000, + "time": "460 m", "book_learn": [ [ "textbook_armschina", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2783,7 +2776,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 7, - "time": 360000, + "time": "360 m", "book_learn": [ [ "textbook_weapwest", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 350 ], [ "oxy_torch", 70 ] ] ], @@ -2800,7 +2793,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 7, - "time": 460000, + "time": "460 m", "book_learn": [ [ "textbook_weapwest", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2817,7 +2810,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 7, - "time": 460000, + "time": "460 m", "book_learn": [ [ "textbook_weapeast", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 450 ], [ "oxy_torch", 90 ] ] ], @@ -2835,7 +2828,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 7, - "time": 46000, + "time": "46 m", "book_learn": [ [ "textbook_weapeast", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], @@ -2849,7 +2842,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "melee", 5 ], - "time": 5000, + "time": "5 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, @@ -2868,7 +2861,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ "melee", 5 ], - "time": 5000, + "time": "5 m", "autolearn": true, "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], @@ -2882,7 +2875,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 4 ], "difficulty": 6, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], "tools": [ @@ -2898,7 +2891,7 @@ "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", "difficulty": 6, - "time": 210000, + "time": "210 m", "book_learn": [ [ "manual_launcher", 7 ] ], "using": [ [ "welding_standard", 3 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ], @@ -2913,7 +2906,7 @@ "skills_required": [ [ "mechanics", 10 ], [ "electronics", 9 ], [ "computer", 2 ] ], "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 50 ], [ "forging_standard", 4 ], [ "surface_heat", 30 ] ], "difficulty": 10, - "time": 720000, + "time": "720 m", "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, @@ -2953,7 +2946,7 @@ "skill_used": "fabrication", "skills_required": [ [ "mechanics", 6 ], [ "gun", 4 ] ], "difficulty": 6, - "time": 180000, + "time": "180 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index 6f83c2ca4683c..07b491a761412 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -5,7 +5,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "reversible": true, "autolearn": true, "components": [ @@ -28,7 +28,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 3, - "time": 120000, + "time": "120 m", "autolearn": true, "using": [ [ "forging_standard", 8 ], [ "steel_standard", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -41,7 +41,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 8, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_fireman", 8 ] ], "using": [ [ "forging_standard", 20 ], [ "steel_standard", 3 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -54,7 +54,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 5, - "time": 240000, + "time": "240 m", "autolearn": true, "using": [ [ "forging_standard", 8 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -71,7 +71,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 1000, + "time": "1 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "pipe", 1 ] ] ] @@ -82,7 +82,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", - "time": 2000, + "time": "2 m", "autolearn": true, "components": [ [ [ "rag", 1 ] ], diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 4498ba3536a14..f08e754a2788d 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -6,7 +6,7 @@ "subcategory": "CSC_WEAPON_CUTTING", "skill_used": "fabrication", "difficulty": 8, - "time": 420000, + "time": "420 m", "book_learn": [ [ "textbook_weapwest", 7 ] ], "using": [ [ "forging_standard", 2 ], [ "steel_standard", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json index 4f5a552ec07ff..ff44f1d383630 100644 --- a/data/json/recipes/weapon/explosive.json +++ b/data/json/recipes/weapon/explosive.json @@ -5,7 +5,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", - "time": 500, + "time": "0 m", "reversible": true, "autolearn": true, "components": [ @@ -21,7 +21,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "cooking", "difficulty": 7, - "time": 10000, + "time": "10 m", "book_learn": [ [ "textbook_anarch", 5 ], [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -46,7 +46,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "electronics", "difficulty": 4, - "time": 32000, + "time": "32 m", "reversible": true, "book_learn": [ [ "textbook_anarch", 5 ], [ "advanced_electronics", 5 ] ], "using": [ [ "soldering_standard", 6 ] ], @@ -71,7 +71,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 1, - "time": 1000, + "time": "1 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -83,7 +83,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", - "time": 3000, + "time": "3 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -97,7 +97,7 @@ "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 3, - "time": 20000, + "time": "20 m", "autolearn": true, "book_learn": [ [ "adv_chemistry", 2 ], [ "textbook_chemistry", 2 ], [ "recipe_labchem", 3 ], [ "atomic_survival", 2 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -116,7 +116,7 @@ "skill_used": "fabrication", "skills_required": [ "cooking", 6 ], "difficulty": 6, - "time": 40000, + "time": "40 m", "reversible": true, "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_anarch", 7 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -137,7 +137,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 4, - "time": 8000, + "time": "8 m", "autolearn": true, "book_learn": [ [ "textbook_gaswarfare", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -156,7 +156,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -183,7 +183,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 3, - "time": 10000, + "time": "10 m", "autolearn": true, "tools": [ [ [ "matches", 20 ] ] ], "components": [ [ [ "string_6", 1 ] ], [ [ "bottle_glass", 1 ], [ "clay_canister", 1 ], [ "flask_glass", 1 ], [ "jar_glass", 1 ] ] ] @@ -194,7 +194,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", - "time": 500, + "time": "0 m", "reversible": true, "autolearn": true, "components": [ @@ -219,7 +219,7 @@ "skill_used": "fabrication", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "components": [ @@ -244,7 +244,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 1, - "time": 5000, + "time": "5 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -270,7 +270,7 @@ "skill_used": "electronics", "skills_required": [ "computer", 4 ], "difficulty": 8, - "time": 32000, + "time": "32 m", "reversible": true, "book_learn": [ [ "textbook_anarch", 8 ], [ "advanced_electronics", 8 ] ], "using": [ [ "soldering_standard", 6 ] ], @@ -285,7 +285,7 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 3, - "time": 7500, + "time": "7 m", "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -303,7 +303,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "cooking", "difficulty": 7, - "time": 120000, + "time": "120 m", "reversible": true, "book_learn": [ [ "manual_launcher", 7 ], [ "textbook_anarch", 8 ] ], "tools": [ [ [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ], [ "soldering_iron", 30 ] ] ], @@ -316,7 +316,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 2, - "time": 15000, + "time": "15 m", "reversible": true, "book_learn": [ [ "manual_launcher", 2 ], [ "textbook_anarch", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -329,7 +329,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 4, - "time": 25000, + "time": "25 m", "reversible": true, "book_learn": [ [ "manual_launcher", 4 ], [ "textbook_anarch", 5 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], @@ -342,7 +342,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 9, - "time": 300000, + "time": "300 m", "reversible": true, "using": [ [ "cordage", 5 ] ], "book_learn": [ [ "manual_launcher", 9 ] ], @@ -356,7 +356,7 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 4, - "time": 30000, + "time": "30 m", "reversible": true, "book_learn": [ [ "manual_launcher", 4 ], [ "textbook_anarch", 5 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ], diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 6e2bdc2bf3c98..67a817456b0d0 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 2 ], - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], @@ -21,7 +21,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 2 ], - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], @@ -35,7 +35,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 2 ], - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], @@ -49,7 +49,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 2 ], - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], @@ -63,7 +63,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ "gun", 2 ], - "time": 20000, + "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], @@ -77,7 +77,7 @@ "skill_used": "fabrication", "difficulty": 1, "skills_required": [ "gun", 2 ], - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ @@ -95,7 +95,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "mechanics", 3 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "welding_standard", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], @@ -109,7 +109,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -122,7 +122,7 @@ "skill_used": "tailor", "difficulty": 3, "skills_required": [ "gun", 1 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], "components": [ [ [ "rag", 2 ] ] ] @@ -135,7 +135,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -148,7 +148,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -161,7 +161,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -174,7 +174,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -187,7 +187,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ "gun", 1 ], - "time": 20000, + "time": "20 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -200,7 +200,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "mechanics", 3 ], - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "welding_standard", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json index a2658382b220b..2ccd7e64285ae 100644 --- a/data/json/recipes/weapon/mods.json +++ b/data/json/recipes/weapon/mods.json @@ -7,7 +7,7 @@ "skill_used": "fabrication", "difficulty": 2, "skills_required": [ [ "gun", 3 ] ], - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_guns", 3 ], [ "mag_pistol", 3 ], @@ -33,7 +33,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required": [ [ "gun", 4 ] ], - "time": 30000, + "time": "30 m", "book_learn": [ [ "mag_guns", 4 ], [ "mag_pistol", 4 ], @@ -59,7 +59,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ [ "gun", 4 ] ], - "time": 15000, + "time": "15 m", "decomp_learn": 3, "book_learn": [ [ "manual_rifle", 2 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 3 ] ], "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], @@ -85,7 +85,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ [ "pistol", 5 ] ], - "time": 15000, + "time": "15 m", "decomp_learn": 4, "book_learn": [ [ "manual_pistol", 2 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 3 ] ], "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], @@ -111,7 +111,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required": [ [ "pistol", 3 ] ], - "time": 15000, + "time": "15 m", "decomp_learn": 4, "book_learn": [ [ "manual_pistol", 3 ], [ "manual_fabrication", 4 ], [ "textbook_fabrication", 4 ] ], "using": [ [ "welding_standard", 15 ] ], @@ -127,7 +127,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 2 ] ], "difficulty": 2, - "time": 6000, + "time": "6 m", "autolearn": true, "book_learn": [ [ "manual_gun", 3 ], [ "mag_archery", 2 ], [ "manual_archery", 1 ] ], "using": [ [ "soldering_standard", 8 ] ], @@ -142,7 +142,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 3 ] ], "difficulty": 4, - "time": 15000, + "time": "15 m", "book_learn": [ [ "manual_gun", 3 ], [ "mag_archery", 2 ], [ "manual_archery", 1 ] ], "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ], @@ -156,7 +156,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 3 ] ], "difficulty": 4, - "time": 15000, + "time": "15 m", "book_learn": [ [ "mag_archery", 3 ], [ "manual_archery", 2 ] ], "using": [ [ "soldering_standard", 20 ] ], "qualities": [ @@ -175,7 +175,7 @@ "skill_used": "fabrication", "skills_required": [ [ "mechanics", 2 ] ], "difficulty": 2, - "time": 2600, + "time": "2 m", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], "components": [ [ [ "filter_liquid", 1 ], [ "muffler", 1 ] ], [ [ "pipe", 1 ] ], [ [ "scrap", 2 ] ] ] @@ -187,7 +187,7 @@ "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 1, - "time": 6000, + "time": "6 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "duct_tape", 75 ] ], [ [ "bottle_twoliter", 1 ] ], [ [ "bottle_plastic", 4 ], [ "bottle_plastic_small", 4 ] ] ] @@ -200,7 +200,7 @@ "skill_used": "fabrication", "skills_required": [ [ "archery", 2 ] ], "difficulty": 2, - "time": 1500, + "time": "1 m", "book_learn": [ [ "mag_archery", 1 ], [ "manual_archery", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "plastic_chunk", 1 ], [ "fur", 1 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ] ] diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json index 0631f05492c93..86522ae1cdd6a 100644 --- a/data/json/recipes/weapon/piercing.json +++ b/data/json/recipes/weapon/piercing.json @@ -6,7 +6,7 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "difficulty": 4, - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "forging_standard", 1 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], @@ -25,7 +25,7 @@ "skill_used": "fabrication", "difficulty": 1, "skills_required": [ "melee", 1 ], - "time": 60000, + "time": "60 m", "autolearn": true, "using": [ [ "welding_standard", 2 ], [ "steel_tiny", 1 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ], diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 3d22141a6fadb..48157a1d643e3 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -7,7 +7,7 @@ "skill_used": "mechanics", "skills_required": [ "launcher", 2 ], "difficulty": 6, - "time": 30000, + "time": "30 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "HAMMER", "level": 2 } ], @@ -22,7 +22,7 @@ "skill_used": "fabrication", "difficulty": 1, "skills_required": [ "gun", 2 ], - "time": 12000, + "time": "12 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -36,7 +36,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 14000, + "time": "14 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -50,7 +50,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 14000, + "time": "14 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -64,7 +64,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 14000, + "time": "14 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -78,7 +78,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 14000, + "time": "14 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -92,7 +92,7 @@ "skill_used": "mechanics", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": 14000, + "time": "14 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -106,7 +106,7 @@ "skill_used": "fabrication", "skills_required": [ "rifle", 4 ], "difficulty": 8, - "time": 240000, + "time": "240 m", "autolearn": true, "book_learn": [ [ "manual_rifle", 5 ], [ "mag_rifle", 6 ] ], "qualities": [ @@ -128,7 +128,7 @@ "skill_used": "fabrication", "skills_required": [ "rifle", 4 ], "difficulty": 7, - "time": 240000, + "time": "240 m", "autolearn": true, "book_learn": [ [ "manual_rifle", 5 ], [ "mag_rifle", 6 ] ], "qualities": [ @@ -150,7 +150,7 @@ "skill_used": "fabrication", "skills_required": [ "pistol", 4 ], "difficulty": 8, - "time": 80000, + "time": "80 m", "autolearn": true, "book_learn": [ [ "manual_pistol", 5 ], [ "mag_pistol", 6 ] ], "qualities": [ @@ -172,7 +172,7 @@ "skill_used": "fabrication", "difficulty": 5, "skills_required": [ "rifle", 3 ], - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "manual_rifle", 3 ], [ "mag_rifle", 4 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW", "level": 1 } ], @@ -188,7 +188,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "rifle", 1 ], - "time": 30000, + "time": "30 m", "autolearn": true, "book_learn": [ [ "manual_rifle", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], @@ -202,7 +202,7 @@ "skill_used": "mechanics", "skills_required": [ "fabrication", 2 ], "difficulty": 3, - "time": 60000, + "time": "60 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "2x4", 2 ], [ "stick", 2 ] ], [ [ "hose", 4 ] ], [ [ "scrap", 4 ] ] ] @@ -215,7 +215,7 @@ "skill_used": "mechanics", "skills_required": [ "fabrication", 2 ], "difficulty": 4, - "time": 90000, + "time": "90 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "2x4", 3 ], [ "stick", 3 ] ], [ [ "hose", 8 ] ], [ [ "scrap", 6 ] ] ] @@ -228,7 +228,7 @@ "skill_used": "mechanics", "skills_required": [ "fabrication", 2 ], "difficulty": 4, - "time": 45000, + "time": "45 m", "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "hose", 2 ] ], [ [ "scrap", 3 ] ] ] diff --git a/data/json/techniques.json b/data/json/techniques.json index 5a4435419c769..fd47df1126c64 100644 --- a/data/json/techniques.json +++ b/data/json/techniques.json @@ -879,6 +879,45 @@ "messages": [ "You hand-peck %s", " hand-pecks %s" ], "stun_dur": 3 }, + { + "type": "technique", + "id": "tec_snake_rapid", + "name": "Snake Snap", + "min_unarmed": 2, + "unarmed_allowed": true, + "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ], + "messages": [ "You swiftly jab %s", " swiftly jabs %s" ] + }, + { + "type": "technique", + "id": "tec_snake_feint", + "name": "Snake Slide", + "min_unarmed": 3, + "unarmed_allowed": true, + "defensive": true, + "miss_recovery": true, + "messages": [ "You make serpentine hand motions at %s", " makes serpentine hand motions at %s" ] + }, + { + "type": "technique", + "id": "tec_snake_break", + "name": "Snake Slither", + "min_unarmed": 4, + "unarmed_allowed": true, + "defensive": true, + "grab_break": true, + "messages": [ "You slither free", " slithers free" ] + }, + { + "type": "technique", + "id": "tec_snake_precise", + "name": "Snake Strike", + "min_unarmed": 4, + "unarmed_allowed": true, + "crit_tec": true, + "messages": [ "You strike out at %s", " strikes out at %s" ], + "stun_dur": 2 + }, { "type": "technique", "id": "tec_brawl_feint", diff --git a/data/json/vehicle_parts.json b/data/json/vehicle_parts.json index 5004771eb34e6..88f299767aa2e 100644 --- a/data/json/vehicle_parts.json +++ b/data/json/vehicle_parts.json @@ -1098,6 +1098,31 @@ }, "breaks_into": [ { "item": "steel_lump" }, { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 1, 3 ] } ] }, + { + "id": "mountable_cooler", + "type": "vehicle_part", + "name": "vehicle-mounted cooler", + "item": "mountable_cooler", + "location": "on_roof", + "symbol": "C", + "broken_symbol": ":", + "color": "light_cyan", + "difficulty": 1, + "durability": 400, + "epower": -120, + "bonus": 10, + "flags": [ "CTRL_ELECTRONIC", "ENABLED_DRAINS_EPOWER", "COOLER" ], + "requirements": { + "install": { + "time": 12000, + "skills": [ [ "mechanics", 1 ], [ "electronics", 1 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ] + }, + "repair": { "skills": [ [ "mechanics", 1 ] ], "time": 3000, "using": [ [ "adhesive", 1 ] ] }, + "removal": { "skills": [ [ "mechanics", 1 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ] } + }, + "breaks_into": [ { "item": "steel_lump" }, { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 1, 3 ] } ] + }, { "type": "vehicle_part", "id": "controls_electronic", diff --git a/data/json/vehicleparts/tanks.json b/data/json/vehicleparts/tanks.json index 6ba9f9e0c4144..81f1e7aff9b8a 100644 --- a/data/json/vehicleparts/tanks.json +++ b/data/json/vehicleparts/tanks.json @@ -98,14 +98,14 @@ { "id": "tank_barrel", "type": "vehicle_part", - "name": "barrel (100L)", + "name": "wooden barrel (100L)", "item": "wooden_barrel", - "location": "fuel_source", + "location": "center", "symbol": "O", "color": "brown", "broken_color": "brown", "durability": 120, - "description": "A storage space for holding liquids. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", + "description": "A storage space for holding liquids, mounted inside the cargo or passenger space. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", "size": 400, "damage_modifier": 80, "breaks_into": [ @@ -115,6 +115,40 @@ ], "flags": [ "NAILABLE", "FLUIDTANK" ] }, + { + "id": "tank_30gal_drum", + "type": "vehicle_part", + "name": "steel drum (100L)", + "item": "30gal_drum", + "location": "center", + "symbol": "0", + "color": "dark_gray", + "broken_color": "red", + "durability": 160, + "difficulty": 1, + "description": "A storage space for holding liquids, mounted inside the cargo or passenger space. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", + "size": 100000, + "breaks_into": [ + { "item": "steel_lump", "count": [ 2, 2 ] }, + { "item": "steel_chunk", "count": [ 1, 2 ] }, + { "item": "scrap", "count": [ 1, 5 ] } + ], + "flags": [ "FLUIDTANK" ] + }, + { + "id": "tank_55gal_drum", + "copy-from": "tank_30gal_drum", + "type": "vehicle_part", + "name": "steel drum (200L)", + "item": "55gal_drum", + "size": 200000, + "breaks_into": [ + { "item": "steel_lump", "count": [ 4, 4 ] }, + { "item": "steel_chunk", "count": [ 2, 4 ] }, + { "item": "scrap", "count": [ 2, 10 ] } + ], + "flags": [ "FLUIDTANK", "OPAQUE", "OBSTACLE" ] + }, { "id": "fuel_bunker", "type": "vehicle_part", diff --git a/data/mods/Magiclysm/Spells/animist.json b/data/mods/Magiclysm/Spells/animist.json new file mode 100644 index 0000000000000..01bfa01e2bb17 --- /dev/null +++ b/data/mods/Magiclysm/Spells/animist.json @@ -0,0 +1,21 @@ +[ + { + "id": "smite", + "type": "SPELL", + "name": "Smite", + "description": "Evil has become pervasive throughout the world. Let your power be the light that shines in the darkness!", + "valid_targets": [ "hostile" ], + "min_damage": 10, + "max_damage": 200, + "damage_increment": 15, + "min_range": 1, + "max_range": 1, + "effect": "target_attack", + "base_casting_time": 85, + "base_energy_cost": 250, + "spell_class": "ANIMIST", + "difficulty": 8, + "max_level": 15, + "energy_source": "MANA" + } +] diff --git a/data/mods/Magiclysm/Spells/biomancer.json b/data/mods/Magiclysm/Spells/biomancer.json new file mode 100644 index 0000000000000..960389a05e160 --- /dev/null +++ b/data/mods/Magiclysm/Spells/biomancer.json @@ -0,0 +1,36 @@ +[ + { + "id": "light_healing", + "type": "SPELL", + "name": "Cure Light Wounds", + "description": "Heals a little bit of damage on the target.", + "valid_targets": [ "self", "ally" ], + "min_damage": -5, + "max_damage": -20, + "damage_increment": -1, + "max_level": 10, + "min_range": 0, + "max_range": 4, + "range_increment": 0.75, + "effect": "target_attack", + "base_casting_time": 300, + "base_energy_cost": 300, + "spell_class": "BIOMANCER", + "difficulty": 2, + "energy_source": "MANA" + }, + { + "id": "pain_split", + "type": "SPELL", + "name": "Pain Split", + "description": "Evens out damage among your limbs.", + "valid_targets": [ "self" ], + "effect": "pain_split", + "base_casting_time": 100, + "base_energy_cost": 800, + "energy_source": "MANA", + "spell_class": "BIOMANCER", + "difficulty": 4, + "max_level": 1 + } +] diff --git a/data/mods/Magiclysm/Spells/classless.json b/data/mods/Magiclysm/Spells/classless.json new file mode 100644 index 0000000000000..60fb4f9e481d9 --- /dev/null +++ b/data/mods/Magiclysm/Spells/classless.json @@ -0,0 +1,120 @@ +[ + { + "id": "megablast", + "type": "SPELL", + "name": "Megablast", + "description": "You always wanted to fire energy beams like in the animes you watched as a kid. Now you can!", + "valid_targets": [ "ally", "hostile", "ground" ], + "effect": "line_attack", + "damage_type": "fire", + "base_casting_time": 200, + "base_energy_cost": 800, + "energy_source": "STAMINA", + "spell_class": "NONE", + "difficulty": 10, + "max_level": 20, + "min_damage": 30, + "max_damage": 100, + "damage_increment": 3.25, + "min_range": 3, + "max_range": 12, + "range_increment": 0.45, + "min_aoe": 1, + "max_aoe": 5, + "aoe_increment": 0.2 + }, + { + "id": "create_atomic_light", + "type": "SPELL", + "name": "Light", + "description": "Creates a magical light.", + "valid_targets": [ "none" ], + "min_range": 0, + "max_range": 0, + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "magic_light", + "energy_source": "MANA", + "difficulty": 1, + "max_level": 20, + "base_casting_time": 1000, + "base_energy_cost": 500, + "min_duration": 100000, + "max_duration": 1000000, + "duration_increment": 2000 + }, + { + "id": "blinding_flash", + "type": "SPELL", + "name": "Blinding Flash", + "description": "Blind enemies for a short time with a sudden, dazzling light. Higher levels deal slightly higher damage.", + "effect": "target_attack", + "effect_str": "blind", + "valid_targets": [ "hostile" ], + "max_level": 20, + "min_damage": 1, + "max_damage": 10, + "damage_increment": 0.5, + "min_aoe": 0, + "max_aoe": 3, + "aoe_increment": 0.15, + "min_range": 4, + "max_range": 16, + "range_increment": 0.6, + "min_duration": 1000, + "max_duration": 3000, + "duration_increment": 100, + "spell_class": "NONE", + "base_casting_time": 200, + "base_energy_cost": 150, + "energy_source": "MANA", + "difficulty": 3, + "damage_type": "none" + }, + { + "id": "ethereal_grasp", + "type": "SPELL", + "name": "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.", + "effect": "target_attack", + "effect_str": "effect_ethereal_grasp", + "valid_targets": [ "hostile" ], + "max_level": 20, + "min_damage": 10, + "max_damage": 30, + "damage_increment": 1, + "min_aoe": 2, + "max_aoe": 20, + "aoe_increment": 0.5, + "min_range": 5, + "max_range": 20, + "range_increment": 2, + "min_duration": 1000, + "max_duration": 5000, + "duration_increment": 200, + "spell_class": "NONE", + "base_casting_time": 200, + "base_energy_cost": 400, + "energy_source": "MANA", + "difficulty": 3, + "damage_type": "bash" + }, + { + "id": "protection_aura", + "type": "SPELL", + "name": "Aura of Protection", + "description": "Encases your whole body in a magical aura that protects you from the environment.", + "valid_targets": [ "self" ], + "effect": "target_attack", + "effect_str": "protect_env", + "energy_source": "MANA", + "difficulty": 1, + "max_level": 20, + "base_casting_time": 350, + "base_energy_cost": 375, + "min_duration": 10000, + "max_duration": 50000, + "duration_increment": 3000 + } +] diff --git a/data/mods/Magiclysm/Spells/debug.json b/data/mods/Magiclysm/Spells/debug.json new file mode 100644 index 0000000000000..0decd801aa140 --- /dev/null +++ b/data/mods/Magiclysm/Spells/debug.json @@ -0,0 +1,93 @@ +[ + { + "//": "This spell exists in json as a template for contributors to see the possible values of the spell", + "id": "example_template", + "type": "SPELL", + "name": "Template Spell", + "description": "This is a template to show off all the available values", + "valid_targets": [ "hostile", "ground", "self", "ally" ], + "//": "effect is only limited by what is coded.", + "effect": "shallow_pit", + "//": "base_casting_time is in moves", + "base_casting_time": 100, + "base_energy_cost": 10, + "//": "Available energy sourcese are: MANA, STAMINA, HP, BIONIC, NONE", + "energy_source": "MANA", + "difficulty": 12, + "max_level": 10, + "min_damage": 0, + "max_damage": 100, + "damage_increment": 2.5, + "min_aoe": 0, + "max_aoe": 5, + "aoe_increment": 0.1, + "min_range": 1, + "max_range": 10, + "range_increment": 2, + "min_dot": 0, + "max_dot": 2, + "dot_increment": 0.1, + "//": "duration is in moves", + "min_duration": 0, + "max_duration": 1000, + "duration_increment": 4, + "min_pierce": 0, + "max_pierce": 1, + "pierce_increment": 0.1 + }, + { + "id": "debug_stamina", + "type": "SPELL", + "name": "Debug Stamina Spell", + "description": "Uses a little stamina", + "valid_targets": [ "self" ], + "effect": "none", + "min_range": 1, + "max_range": 1, + "base_casting_time": 100, + "base_energy_cost": 100, + "energy_source": "STAMINA" + }, + { + "id": "debug_hp", + "type": "SPELL", + "name": "Debug HP Spell", + "description": "Uses a little HP", + "valid_targets": [ "self" ], + "effect": "none", + "min_range": 1, + "max_range": 1, + "base_casting_time": 100, + "base_energy_cost": 30, + "energy_source": "HP" + }, + { + "id": "debug_bionic", + "type": "SPELL", + "name": "Debug Bionic Spell", + "description": "Uses a little Bionic Power", + "valid_targets": [ "self" ], + "effect": "none", + "min_range": 1, + "max_range": 1, + "base_casting_time": 100, + "base_energy_cost": 150, + "energy_source": "BIONIC" + }, + { + "id": "debug_effect", + "type": "SPELL", + "name": "Debug effect spell", + "description": "Adds an effect to the target", + "valid_targets": [ "self", "hostile", "ally" ], + "effect": "target_attack", + "effect_str": "dazed", + "min_range": 12, + "max_range": 12, + "base_casting_time": 100, + "base_energy_cost": 150, + "min_duration": 500, + "max_duration": 500, + "energy_source": "MANA" + } +] diff --git a/data/mods/Magiclysm/Spells/earthshaper.json b/data/mods/Magiclysm/Spells/earthshaper.json new file mode 100644 index 0000000000000..3d1d9a93f9d78 --- /dev/null +++ b/data/mods/Magiclysm/Spells/earthshaper.json @@ -0,0 +1,50 @@ +[ + { + "id": "stonefist", + "type": "SPELL", + "name": "Stonefist", + "description": "Encases your arms and hands in a sheath of magical stone, you can punch and defend yourself with it in melee combat.", + "valid_targets": [ "self" ], + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "apt_stonefist", + "spell_class": "EARTHSHAPER", + "energy_source": "MANA", + "difficulty": 2, + "max_level": 20, + "base_casting_time": 200, + "base_energy_cost": 100, + "min_duration": 10000, + "max_duration": 100000, + "duration_increment": 2000 + }, + { + "id": "seismic_stomp", + "type": "SPELL", + "name": "Seismic Stomp", + "description": "Focusing mana into your leg, you stomp your foot and send out a shockwave, knocking enemies around you onto the ground.", + "effect": "cone_attack", + "effect_str": "downed", + "valid_targets": [ "hostile", "ground" ], + "max_level": 10, + "min_damage": 2, + "max_damage": 10, + "damage_increment": 0, + "min_aoe": 360, + "max_aoe": 360, + "aoe_increment": 0, + "min_range": 3, + "max_range": 12, + "range_increment": 1, + "min_duration": 1000, + "max_duration": 6000, + "duration_increment": 500, + "spell_class": "EARTHSHAPER", + "base_casting_time": 100, + "base_energy_cost": 250, + "energy_source": "MANA", + "difficulty": 2, + "damage_type": "bash" + } +] diff --git a/data/mods/Magiclysm/Spells/kelvinist.json b/data/mods/Magiclysm/Spells/kelvinist.json new file mode 100644 index 0000000000000..8b0409c9d6c38 --- /dev/null +++ b/data/mods/Magiclysm/Spells/kelvinist.json @@ -0,0 +1,269 @@ +[ + { + "id": "point_flare", + "type": "SPELL", + "name": "Point Flare", + "description": "Causes an intense heat at the location, damaging the target.", + "valid_targets": [ "hostile" ], + "effect": "target_attack", + "damage_type": "fire", + "min_damage": 16, + "damage_increment": 4, + "max_damage": 80, + "min_range": 3, + "range_increment": 0.5, + "max_range": 11, + "base_energy_cost": 75, + "spell_class": "KELVINIST", + "difficulty": 4, + "max_level": 16, + "base_casting_time": 300, + "energy_source": "MANA" + }, + { + "id": "ice_spike", + "type": "SPELL", + "name": "Ice Spike", + "description": "Causes jagged icicles to form in the air above the target, falling and damaging it.", + "valid_targets": [ "hostile" ], + "effect": "target_attack", + "damage_type": "cold", + "min_damage": 30, + "max_damage": 100, + "damage_increment": 3.5, + "min_range": 4, + "max_range": 12, + "range_increment": 0.6, + "max_level": 20, + "difficulty": 6, + "spell_class": "KELVINIST", + "base_casting_time": 200, + "energy_source": "MANA", + "base_energy_cost": 100 + }, + { + "id": "fireball", + "type": "SPELL", + "name": "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.", + "effect": "projectile_attack", + "valid_targets": [ "self", "ally", "hostile", "ground" ], + "max_level": 20, + "min_damage": 24, + "max_damage": 68, + "damage_increment": 1.2, + "min_aoe": 3, + "max_aoe": 5, + "aoe_increment": 0.1, + "min_range": 6, + "max_range": 20, + "range_increment": 1, + "spell_class": "KELVINIST", + "base_casting_time": 200, + "base_energy_cost": 350, + "energy_source": "MANA", + "difficulty": 4, + "damage_type": "fire" + }, + { + "id": "cone_cold", + "type": "SPELL", + "name": "Cone of Cold", + "description": "You blast a cone of frigid air toward the target.", + "effect": "cone_attack", + "valid_targets": [ "ally", "hostile", "ground" ], + "max_level": 20, + "min_damage": 24, + "max_damage": 68, + "damage_increment": 1.2, + "min_aoe": 30, + "max_aoe": 60, + "aoe_increment": 1.4, + "min_range": 6, + "max_range": 20, + "range_increment": 1, + "spell_class": "KELVINIST", + "base_casting_time": 200, + "base_energy_cost": 350, + "energy_source": "MANA", + "difficulty": 4, + "damage_type": "cold" + }, + { + "id": "burning_hands", + "type": "SPELL", + "name": "Burning Hands", + "description": "You're pretty sure you saw this in a game somewhere. You fire a short-range cone of fire.", + "effect": "cone_attack", + "valid_targets": [ "ally", "hostile", "ground" ], + "max_level": 20, + "min_damage": 8, + "max_damage": 65, + "damage_increment": 4, + "min_range": 3, + "max_range": 5, + "range_increment": 0.25, + "min_aoe": 25, + "max_aoe": 60, + "aoe_increment": 5, + "spell_class": "KELVINIST", + "base_casting_time": 100, + "base_energy_cost": 150, + "energy_source": "MANA", + "difficulty": 2, + "damage_type": "fire" + }, + { + "id": "iceball", + "type": "SPELL", + "name": "Hoary Blast", + "description": "A glowing chunk of ice bursts into being from your hand and explodes into a wave of intense cold on impact.", + "effect": "projectile_attack", + "valid_targets": [ "self", "ally", "hostile", "ground" ], + "max_level": 20, + "min_damage": 24, + "max_damage": 68, + "damage_increment": 1.2, + "min_aoe": 3, + "max_aoe": 5, + "aoe_increment": 0.1, + "min_range": 6, + "max_range": 20, + "range_increment": 1, + "spell_class": "KELVINIST", + "base_casting_time": 150, + "base_energy_cost": 150, + "energy_source": "MANA", + "difficulty": 3, + "damage_type": "cold" + }, + { + "id": "frost_spray", + "type": "SPELL", + "name": "Frost Spray", + "description": "You're pretty sure you saw this in a game somewhere. You fire a short-range cone of ice and cold.", + "effect": "cone_attack", + "effect_str": "cold", + "valid_targets": [ "ally", "hostile", "ground" ], + "max_level": 20, + "min_damage": 8, + "max_damage": 65, + "damage_increment": 4, + "min_range": 3, + "max_range": 5, + "range_increment": 0.25, + "min_aoe": 25, + "max_aoe": 60, + "aoe_increment": 5, + "spell_class": "KELVINIST", + "base_casting_time": 100, + "base_energy_cost": 100, + "energy_source": "MANA", + "difficulty": 2, + "damage_type": "cold" + }, + { + "id": "chilling_touch", + "type": "SPELL", + "name": "Chilling Touch", + "description": "Freezes the touched target with intense cold.", + "valid_targets": [ "hostile" ], + "effect": "target_attack", + "effect_str": "cold", + "damage_type": "cold", + "min_damage": 3, + "damage_increment": 4, + "max_damage": 40, + "min_range": 1, + "max_range": 1, + "base_energy_cost": 50, + "spell_class": "KELVINIST", + "difficulty": 1, + "max_level": 10, + "base_casting_time": 100, + "energy_source": "MANA" + }, + { + "id": "glide_ice", + "type": "SPELL", + "name": "Glide on Ice", + "description": "Encases your feet in a magical coating of ice, allowing you to glide along smooth surfaces faster.", + "valid_targets": [ "none" ], + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "ice_gliders", + "energy_source": "MANA", + "spell_class": "KELVINIST", + "difficulty": 2, + "max_level": 20, + "base_casting_time": 650, + "base_energy_cost": 100, + "min_duration": 10000, + "max_duration": 100000, + "duration_increment": 2000 + }, + { + "id": "hoary_blast", + "type": "SPELL", + "name": "Hoary Blast", + "description": "You project a glowing white crystal of ice and it explodes on impact into a blossom of shattering cold.", + "effect": "projectile_attack", + "effect_str": "cold", + "valid_targets": [ "self", "ally", "hostile", "ground" ], + "max_level": 20, + "min_damage": 24, + "max_damage": 68, + "damage_increment": 1.2, + "min_aoe": 3, + "max_aoe": 5, + "aoe_increment": 0.1, + "min_range": 6, + "max_range": 20, + "range_increment": 1, + "spell_class": "KELVINIST", + "base_casting_time": 200, + "base_energy_cost": 350, + "energy_source": "MANA", + "difficulty": 4, + "damage_type": "cold" + }, + { + "id": "ice_shield", + "type": "SPELL", + "name": "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.", + "valid_targets": [ "none" ], + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "shield_ice", + "energy_source": "MANA", + "spell_class": "KELVINIST", + "difficulty": 2, + "max_level": 20, + "base_casting_time": 150, + "base_energy_cost": 100, + "min_duration": 10000, + "max_duration": 50000, + "duration_increment": 3000 + }, + { + "id": "frost_armor", + "type": "SPELL", + "name": "Frost Armor", + "description": "Covers you in a thin layer of magical ice to protect you from harm.", + "valid_targets": [ "self" ], + "effect": "target_attack", + "effect_str": "armor_frost", + "energy_source": "MANA", + "spell_class": "KELVINIST", + "difficulty": 3, + "max_level": 20, + "base_casting_time": 200, + "base_energy_cost": 550, + "min_duration": 10000, + "max_duration": 50000, + "duration_increment": 3000 + } +] diff --git a/data/mods/Magiclysm/Spells/magus.json b/data/mods/Magiclysm/Spells/magus.json new file mode 100644 index 0000000000000..e730706fb30a9 --- /dev/null +++ b/data/mods/Magiclysm/Spells/magus.json @@ -0,0 +1,67 @@ +[ + { + "id": "magic_missile", + "type": "SPELL", + "name": "Magic Missile", + "description": "I cast Magic Missile at the darkness!", + "valid_targets": [ "hostile" ], + "min_damage": 1, + "damage_increment": 1.5, + "damage_type": "none", + "max_damage": 20, + "min_range": 8, + "range_increment": 0.8, + "max_range": 20, + "base_energy_cost": 50, + "spell_class": "MAGUS", + "difficulty": 1, + "max_level": 15, + "base_casting_time": 100, + "energy_source": "MANA", + "effect": "target_attack" + }, + { + "id": "phase_door", + "type": "SPELL", + "name": "Phase Door", + "description": "Teleports you in a random direction a short distance.", + "effect": "teleport_random", + "valid_targets": [ "none" ], + "min_range": 3, + "max_range": 4, + "range_increment": 0.1, + "min_aoe": 2, + "max_aoe": 4, + "aoe_increment": 0.2, + "max_level": 10, + "difficulty": 2, + "spell_class": "MAGUS", + "base_casting_time": 100, + "energy_source": "MANA", + "base_energy_cost": 100 + }, + { + "id": "gravity_well", + "type": "SPELL", + "name": "Gravity Well", + "description": "Summons a well of gravity with the epicenter at the location. Deals bashing damage to all creatures in the affected area.", + "effect": "target_attack", + "valid_targets": [ "self", "ally", "hostile", "ground" ], + "min_damage": 20, + "max_damage": 45, + "damage_increment": 1.2, + "damage_type": "bash", + "min_range": 5, + "max_range": 15, + "range_increment": 0.5, + "min_aoe": 1, + "max_aoe": 6, + "aoe_increment": 0.25, + "max_level": 20, + "difficulty": 10, + "spell_class": "MAGUS", + "base_casting_time": 600, + "energy_source": "MANA", + "base_energy_cost": 350 + } +] diff --git a/data/mods/Magiclysm/Spells/stormshaper.json b/data/mods/Magiclysm/Spells/stormshaper.json new file mode 100644 index 0000000000000..fc2a1074d4ba0 --- /dev/null +++ b/data/mods/Magiclysm/Spells/stormshaper.json @@ -0,0 +1,95 @@ +[ + { + "id": "jolt", + "type": "SPELL", + "name": "Jolt", + "description": "A short ranged fan of elecricity shoots from your fingers.", + "effect": "cone_attack", + "valid_targets": [ "ally", "hostile", "ground" ], + "max_level": 20, + "min_damage": 8, + "max_damage": 65, + "damage_increment": 4, + "min_range": 3, + "max_range": 5, + "range_increment": 0.25, + "min_aoe": 25, + "max_aoe": 60, + "aoe_increment": 5, + "spell_class": "STORMSHAPER", + "base_casting_time": 100, + "base_energy_cost": 150, + "energy_source": "MANA", + "difficulty": 2, + "damage_type": "electric" + }, + { + "id": "windstrike", + "type": "SPELL", + "name": "Windstrike", + "description": "A powerful blast of wind slams into anything in front of your outstretched hand.", + "effect": "cone_attack", + "effect_str": "downed", + "valid_targets": [ "ally", "hostile", "ground" ], + "max_level": 10, + "min_damage": 24, + "max_damage": 68, + "damage_increment": 1.2, + "min_aoe": 30, + "max_aoe": 60, + "aoe_increment": 1.4, + "min_range": 6, + "max_range": 20, + "range_increment": 1, + "min_duration": 200, + "max_duration": 1000, + "duration_increment": 100, + "base_casting_time": 125, + "base_energy_cost": 285, + "spell_class": "STORMSHAPER", + "energy_source": "MANA", + "difficulty": 3, + "damage_type": "bash" + }, + { + "id": "windrun", + "type": "SPELL", + "name": "Windrunning", + "description": "A magical wind pushes you forward as you move, easing your movements and increasing speed.", + "base_casting_time": 125, + "base_energy_cost": 100, + "energy_source": "MANA", + "spell_class": "STORMSHAPER", + "difficulty": 2, + "effect": "target_attack", + "effect_str": "enchant_windrun", + "valid_targets": [ "ally", "self" ], + "max_level": 10, + "min_duration": 2000, + "max_duration": 10000, + "duration_increment": 1000, + "min_range": 1, + "max_range": 20, + "range_increment": 1 + }, + { + "id": "storm_hammer", + "type": "SPELL", + "name": "Call Stormhammer", + "description": "Creates a crackling magical warhammer full of lightning to smite your foes with, and of course, smash things to bits!", + "valid_targets": [ "self" ], + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "stormhammer", + "energy_source": "MANA", + "spell_class": "STORMSHAPER", + "difficulty": 3, + "max_level": 20, + "base_casting_time": 150, + "base_energy_cost": 100, + "min_duration": 10000, + "max_duration": 50000, + "duration_increment": 2000 + } +] diff --git a/data/mods/Magiclysm/Spells/technomancer.json b/data/mods/Magiclysm/Spells/technomancer.json new file mode 100644 index 0000000000000..e9dedc159d846 --- /dev/null +++ b/data/mods/Magiclysm/Spells/technomancer.json @@ -0,0 +1,97 @@ +[ + { + "id": "bless", + "type": "SPELL", + "name": "Bless", + "description": "A spell of blessing that gives you energy and boosts your abilities.", + "valid_targets": [ "self", "ally" ], + "effect": "target_attack", + "effect_str": "bless", + "base_casting_time": 100, + "base_energy_cost": 100, + "energy_source": "MANA", + "spell_class": "TECHNOMANCER", + "difficulty": 1, + "max_level": 1, + "min_damage": 0, + "max_damage": -20, + "damage_increment": -1, + "min_aoe": 0, + "max_aoe": 5, + "aoe_increment": 0.1, + "min_range": 1, + "max_range": 10, + "range_increment": 2, + "dot_increment": 0.1, + "//": "duration is in moves", + "min_duration": 6000, + "max_duration": 10000, + "duration_increment": 400 + }, + { + "id": "holy_blade", + "type": "SPELL", + "name": "Holy Blade", + "description": "This blade of light will cut through any evil it makes contact with!", + "valid_targets": [ "self" ], + "min_range": 0, + "max_range": 0, + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "longsword", + "base_casting_time": 350, + "base_energy_cost": 375, + "min_duration": 3000, + "max_duration": 9000, + "duration_increment": 3000, + "difficulty": 5, + "max_level": 20, + "spell_class": "TECHNOMANCER", + "energy_source": "MANA" + }, + { + "id": "spirit_armor", + "type": "SPELL", + "name": "Spiritual Armor", + "description": "Evil will not make it through your defenses if your faith is strong enough!", + "valid_targets": [ "self" ], + "min_range": 0, + "max_range": 0, + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "armor_lightplate", + "spell_class": "TECHNOMANCER", + "energy_source": "MANA", + "difficulty": 5, + "max_level": 20, + "base_casting_time": 350, + "base_energy_cost": 375, + "min_duration": 3000, + "max_duration": 9000, + "duration_increment": 3000 + }, + { + "id": "create_atomic_lamp", + "type": "SPELL", + "name": "Lamp", + "description": "Creates a magical lamp.", + "valid_targets": [ "none" ], + "min_range": 0, + "max_range": 0, + "min_damage": 1, + "max_damage": 1, + "effect": "spawn_item", + "effect_str": "magic_lamp", + "energy_source": "MANA", + "spell_class": "TECHNOMANCER", + "difficulty": 2, + "max_level": 20, + "base_casting_time": 200, + "base_energy_cost": 750, + "min_duration": 100000, + "max_duration": 1000000, + "duration_increment": 2000 + } +] diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json new file mode 100644 index 0000000000000..15c29a49ec298 --- /dev/null +++ b/data/mods/Magiclysm/effects/effects.json @@ -0,0 +1,61 @@ +[ + { + "type": "effect_type", + "id": "enchant_windrun", + "name": [ "Windrunning" ], + "desc": [ "You are bolstered and pushed along by the power of the wind." ], + "apply_message": "You are bolstered and pushed along by the power of the wind", + "remove_message": "The wind at your back dies down.", + "rating": "good", + "base_mods": { "speed_mod": [ 20 ], "stamina_min": [ 10 ] } + }, + { + "type": "effect_type", + "id": "effect_ethereal_grasp", + "name": [ "Ethereal Hold" ], + "desc": [ "Ghostly arms are trying to hold you in place!" ], + "max_intensity": 4, + "int_add_val": 1, + "apply_message": "Ethereal arms shoot out of the ground and grab onto you!", + "remove_message": "The ghostly arms fade away.", + "base_mods": { "speed_mod": [ -40 ] }, + "scaling_mods": { "speed_mod": [ -10 ] } + }, + { + "type": "effect_type", + "id": "bless", + "name": [ "Blessed" ], + "desc": [ "You are filled with energy that improves everything you do." ], + "apply_message": "You are filled with energy that improves everything you do!", + "remove_message": "Your energy fades.", + "rating": "good", + "base_mods": { "per_mod": [ 2 ], "dex_mod": [ 2 ], "str_mod": [ 2, 2 ], "speed_mod": [ 20 ] } + }, + { + "type": "effect_type", + "id": "protect_env", + "name": [ "Enviromental Protection" ], + "desc": [ "You are protected by an energy field." ], + "apply_message": "You are protected by an energy field.", + "remove_message": "Your energy field fades.", + "rating": "good", + "show_in_info": true, + "base_mods": { + "environmental_protection": [ 5 ], + "material_thickness": [ 3 ], + "warmth": [ 50 ], + "covers": [ "HEAD", "LEGS", "TORSO", "ARMS", "HANDS", "FEET" ] + } + }, + { + "type": "effect_type", + "id": "armor_frost", + "name": [ "Frost Armor" ], + "desc": [ "Covers you in a thin layer of magical ice to protect you from harm." ], + "apply_message": "You are protected by Frost Armor.", + "remove_message": "Your Frost Armor melts away.", + "rating": "good", + "show_in_info": true, + "base_mods": { "environmental_protection": [ 5 ], "material_thickness": [ 5 ], "warmth": [ 20 ] } + } +] diff --git a/data/mods/Magiclysm/itemgroups.json b/data/mods/Magiclysm/itemgroups.json new file mode 100644 index 0000000000000..b2182920bc4d5 --- /dev/null +++ b/data/mods/Magiclysm/itemgroups.json @@ -0,0 +1,53 @@ +[ + { + "type": "item_group", + "id": "religious_books", + "items": [ [ "priest_beginner", 1 ], [ "priest_advanced", 1 ] ] + }, + { + "type": "item_group", + "id": "novels", + "items": [ [ "wizard_beginner", 3 ], [ "wizard_advanced", 1 ] ] + }, + { + "type": "item_group", + "id": "homebooks", + "items": [ [ "wizard_beginner", 3 ], [ "wizard_advanced", 1 ], [ "priest_beginner", 5 ], [ "wizard_utility", 3 ] ] + }, + { + "type": "item_group", + "id": "manuals", + "items": [ [ "wizard_beginner", 3 ], [ "wizard_advanced", 1 ], [ "wizard_utility", 5 ] ] + }, + { + "type": "item_group", + "id": "lab_bookshelves", + "items": [ + [ "wizard_beginner", 3 ], + [ "wizard_advanced", 5 ], + [ "priest_beginner", 3 ], + [ "wizard_utility", 5 ], + [ "priest_advanced", 5 ], + [ "pyro", 6 ], + [ "winter_grasp", 6 ], + [ "tome_of_storms", 3 ] + ] + }, + { + "type": "item_group", + "id": "mansion_books", + "items": [ + [ "wizard_beginner", 10 ], + [ "wizard_advanced", 5 ], + [ "priest_beginner", 10 ], + [ "pyro", 3 ], + [ "winter_grasp", 3 ], + [ "tome_of_storms", 3 ] + ] + }, + { + "type": "item_group", + "id": "exotic_books", + "items": [ [ "wizard_advanced", 12 ], [ "pyro", 3 ], [ "winter_grasp", 3 ], [ "tome_of_storms", 3 ], [ "priest_advanced", 6 ] ] + } +] diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json new file mode 100644 index 0000000000000..e86e6e1a42456 --- /dev/null +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -0,0 +1,174 @@ +[ + { + "id": "stonefist", + "type": "GENERIC", + "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, + "price": 1, + "to_hit": 2, + "bashing": 20, + "material": [ "superalloy" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "HANDS", "ARMS" ], + "coverage": 100, + "encumbrance": 0, + "warmth": 20, + "material_thickness": 4, + "environmental_protection": 10, + "qualities": [ [ "HAMMER", 1 ] ], + "flags": [ "VARSIZE", "STURDY", "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE" ], + "techniques": [ "WBLOCK_3" ] + }, + { + "id": "armor_stonefist", + "type": "ARMOR", + "category": "armor", + "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, + "price": 1, + "to_hit": 2, + "bashing": 20, + "material": [ "superalloy" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "HANDS", "ARMS" ], + "coverage": 100, + "encumbrance": 0, + "warmth": 20, + "material_thickness": 4, + "environmental_protection": 10, + "qualities": [ [ "HAMMER", 1 ] ], + "flags": [ "VARSIZE", "STURDY", "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE" ], + "techniques": [ "WBLOCK_3" ] + }, + { + "id": "magic_lamp", + "type": "ARMOR", + "category": "tools", + "name": "magic lamp", + "description": "a magical light source that will light up a small area.", + "weight": 1, + "volume": 1, + "price": 1, + "to_hit": -2, + "bashing": 8, + "symbol": ",", + "color": "light_green", + "flags": [ "LIGHT_15", "LEAK_DAM" ] + }, + { + "id": "magic_light", + "type": "ARMOR", + "category": "tools", + "name": "magic light", + "description": "A small magical light that you can read by.", + "weight": 0, + "volume": 0, + "price": 0, + "symbol": ",", + "color": "light_green", + "flags": [ "LIGHT_5", "LEAK_DAM" ] + }, + { + "id": "shield_ice", + "type": "ARMOR", + "name": "large shield of magical ice", + "category": "armor", + "description": "A lightweight but tough shield crafted entirely of magical ice.", + "weight": 1000, + "volume": 20, + "price": 1, + "to_hit": 1, + "bashing": 14, + "material": [ "steel" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "ARM_EITHER", "HAND_EITHER" ], + "coverage": 70, + "encumbrance": 20, + "material_thickness": 3, + "techniques": [ "WBLOCK_3" ], + "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "BLOCK_WHILE_WORN" ] + }, + { + "id": "ice_gliders", + "type": "ARMOR", + "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, + "price": 1, + "to_hit": -2, + "bashing": 6, + "material": [ "steel" ], + "symbol": "[", + "color": "brown", + "covers": [ "FEET" ], + "coverage": 100, + "encumbrance": 0, + "warmth": 30, + "material_thickness": 3, + "environmental_protection": 2, + "flags": [ "WATERPROOF", "ROLLER_QUAD", "BELTED" ] + }, + { + "type": "GENERIC", + "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, + "to_hit": 2, + "color": "brown", + "symbol": "/", + "material": [ "superalloy" ], + "techniques": [ "WBLOCK_2", "BRUTAL", "SWEEP" ], + "flags": [ "DURABLE_MELEE", "SPEAR", "NONCONDUCTIVE", "BELT_CLIP", "LIGHT_15" ], + "volume": 5, + "bashing": 30, + "electric": 15, + "price": 0, + "qualities": [ [ "HAMMER", 1 ] ] + }, + { + "id": "stormfist", + "type": "SPELL", + "name": "Stormfist", + "description": "Encases your arm and hand in a sheath of crackling magical lightning, you can punch and defend yourself with it in melee combat.", + "valid_targets": [ "self" ], + "min_damage": 0, + "max_damage": 0, + "effect": "spawn_item", + "effect_str": "stormglove", + "energy_source": "MANA", + "difficulty": 2, + "max_level": 20, + "base_casting_time": 200, + "base_energy_cost": 100, + "min_duration": 10000, + "max_duration": 100000, + "duration_increment": 2000 + }, + { + "type": "GENERIC", + "id": "stormglove", + "symbol": "3", + "color": "light_gray", + "name": "Stormfist", + "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, + "bashing": 10, + "electric": 15, + "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE", "LIGHT_5" ] + } +] diff --git a/data/mods/Magiclysm/items/spellbooks.json b/data/mods/Magiclysm/items/spellbooks.json new file mode 100644 index 0000000000000..d081718484e61 --- /dev/null +++ b/data/mods/Magiclysm/items/spellbooks.json @@ -0,0 +1,133 @@ +[ + { + "id": "DEBUG_spellbook", + "type": "GENERIC", + "name": "A Technomancer's Guide to Debugging C:DDA", + "description": "static std::string description( spell sp ) const;", + "weight": 1, + "volume": "1 ml", + "symbol": "?", + "color": "magenta", + "use_action": { + "type": "learn_spell", + "spells": [ + "debug_hp", + "debug_stamina", + "example_template", + "debug_bionic", + "pain_split", + "fireball", + "gravity_well", + "cone_cold", + "megablast" + ] + } + }, + { + "id": "wizard_beginner", + "type": "GENERIC", + "name": "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, + "price": 5000, + "symbol": "?", + "color": "light_red", + "use_action": { "type": "learn_spell", "spells": [ "magic_missile", "phase_door" ] } + }, + { + "id": "wizard_utility", + "type": "GENERIC", + "name": "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, + "price": 35000, + "symbol": "?", + "color": "red", + "use_action": { "type": "learn_spell", "spells": [ "phase_door", "burning_hands", "pain_split" ] } + }, + { + "id": "pyro", + "type": "GENERIC", + "name": "Pyromancy for Heretics", + "description": "This charred husk of a book still contains many ways to light things aflame.", + "weight": 450, + "volume": 4, + "price": 1904, + "symbol": "?", + "color": "light_red", + "use_action": { "type": "learn_spell", "spells": [ "point_flare", "fireball", "burning_hands" ] } + }, + { + "id": "wizard_advanced", + "type": "GENERIC", + "name": "A Treatise on Magical Elements", + "description": "This details complex diagrams, rituals, and choreography that describes various spells.", + "weight": 920, + "volume": 3, + "price": 30000, + "symbol": "?", + "color": "light_red", + "use_action": { "type": "learn_spell", "spells": [ "point_flare", "ice_spike", "gravity_well", "pain_split" ] } + }, + { + "id": "priest_beginner", + "type": "GENERIC", + "name": "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, + "price": 5000, + "symbol": "?", + "color": "light_green", + "use_action": { "type": "learn_spell", "spells": [ "light_healing" ] } + }, + { + "id": "priest_advanced", + "type": "GENERIC", + "name": "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, + "price": 30000, + "symbol": "?", + "color": "green", + "use_action": { "type": "learn_spell", "spells": [ "smite" ] } + }, + { + "id": "winter_grasp", + "type": "GENERIC", + "name": "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, + "price": 1904, + "symbol": "?", + "color": "light_blue", + "use_action": { "type": "learn_spell", "spells": [ "cone_cold", "ice_spike", "hoary_blast", "chilling_touch", "frost_spray" ] } + }, + { + "id": "tome_of_storms", + "type": "GENERIC", + "name": "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, + "price": 5000, + "symbol": "?", + "color": "light_grey", + "use_action": { "type": "learn_spell", "spells": [ "jolt", "windstrike" ] } + }, + { + "id": "generic_spellbook", + "type": "GENERIC", + "name": "Nondescript Spellbook", + "description": "A small book, containing spells created by a novice magician.", + "weight": 355, + "volume": 2, + "symbol": "?", + "color": "magenta", + "use_action": { "type": "learn_spell", "spells": [ "seismic_stomp" ] } + } +] diff --git a/data/mods/Magiclysm/modinfo.json b/data/mods/Magiclysm/modinfo.json new file mode 100644 index 0000000000000..fab3d8f390c7c --- /dev/null +++ b/data/mods/Magiclysm/modinfo.json @@ -0,0 +1,18 @@ +[ + { + "type": "MOD_INFO", + "ident": "magiclysm", + "name": "Magiclysm", + "authors": [ "KorGgenT", "Aptronym" ], + "maintainer": [ "KorGgenT" ], + "description": "Cataclysm but with magic spells!", + "category": "content", + "dependencies": [ "dda" ] + }, + { + "type": "skill", + "ident": "spellcraft", + "name": "spellcraft", + "description": "Your skill in the arcane. Represents magic theory and all that entails. A higher skill increases how quickly you can learn spells, and decreases their spell failure chance. You learn this skill by studying books or spells." + } +] diff --git a/data/mods/Magiclysm/professions.json b/data/mods/Magiclysm/professions.json new file mode 100644 index 0000000000000..ecf418a2c42ca --- /dev/null +++ b/data/mods/Magiclysm/professions.json @@ -0,0 +1,39 @@ +[ + { + "type": "profession", + "ident": "wizard_novice", + "name": "Would-be Wizard", + "description": "You found a pamphlet with bright colors claiming you can be a Wizard, oddly serene with the world falling down around you.", + "points": -2, + "items": { + "both": [ + "jeans", + "tshirt", + "gloves_light", + "hat_ball", + "boots", + "socks", + "hoodie", + "knit_scarf", + "pockknife", + "lighter", + "wizard_beginner" + ], + "male": [ "boxer_briefs" ], + "female": [ "bra", "panties" ] + } + }, + { + "type": "profession", + "ident": "priest", + "name": "Priest", + "description": "When the apocalypse struck, you did everything you could to protect your parish faithful, but it appears that prayers were not enough. Now that they are all dead, you should probably find something more tangible to protect you.", + "points": 0, + "skills": [ { "level": 3, "name": "speech" } ], + "items": { + "both": [ "pants", "longshirt", "socks", "cassock", "dress_shoes", "holy_symbol", "priest_beginner", "cell_phone" ], + "male": [ "briefs" ], + "female": [ "bra", "panties" ] + } + } +] diff --git a/data/mods/Magiclysm/traits/classes.json b/data/mods/Magiclysm/traits/classes.json new file mode 100644 index 0000000000000..caaf2f5f178cb --- /dev/null +++ b/data/mods/Magiclysm/traits/classes.json @@ -0,0 +1,82 @@ +[ + { + "type": "mutation", + "id": "MAGUS", + "name": "Magus", + "points": 0, + "description": "Oh! I've heard this joke.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "ANIMIST" ] + }, + { + "type": "mutation", + "id": "ANIMIST", + "name": "Animist", + "points": 0, + "description": "The animist tradition is a relatively new school of magical thought, formed through combination of many older ways that focus on harmony and connection to the natural world. This does not mean that animists are passive: the natural world is a savage place.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "MAGUS" ] + }, + { + "type": "mutation", + "id": "KELVINIST", + "name": "Kelvinist", + "points": 0, + "description": "Disciples of the great Archwizard Lord Kelvin. Kelvinists focus their magic on manipulation and control of the temperature of their environment, leading to spectacularly powerful explosions or bone-chilling cold.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "STORMSHAPER" ] + }, + { + "type": "mutation", + "id": "STORMSHAPER", + "name": "Stormshaper", + "points": 0, + "description": "Stormshapers follow ancient arcane disciplines of meditation and harmony with the winds and tides that shape the planet. Through their deep connection to these forces, they can request powerful changes.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "KELVINIST" ] + }, + { + "type": "mutation", + "id": "TECHNOMANCER", + "name": "Technomancer", + "points": 0, + "description": "Technomancers are the new breed of modern magician, blending their arcane might with their advanced knowledge of the fundamental nature of the universe. They use technology to enhance their magic and vice versa.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "EARTHSHAPER" ] + }, + { + "type": "mutation", + "id": "EARTHSHAPER", + "name": "Earthshaper", + "points": 0, + "description": "Earthshapers have allowed their minds to sink deep within the stones and metals of the planet, and become one with its secrets. To a master Earthshaper, spells can be as permanent as the stones they are created from, and time is measured in geological eras.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "TECHNOMANCER" ] + }, + { + "type": "mutation", + "id": "BIOMANCER", + "name": "Biomancer", + "points": 0, + "description": "The Biomancer focuses on manipulating and even absorbing flesh; their own, and that of other living or dead things. Most other wizards find their powers gross and disturbing, but no one can question the potency of their abilities, and certainly not their adaptability to any situation.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "DRUID" ] + }, + { + "type": "mutation", + "id": "DRUID", + "name": "Druid", + "points": 0, + "description": "Druids follow a wild tradition of allegiance and rebirth within the world of nature, especially the cycle of death and rebirth that is the plant world. A powerful druid is as much a part of that world as the human one.", + "starting_trait": false, + "purifiable": false, + "cancels": [ "BIOMANCER" ] + } +] diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json index 0451f1a6671e7..f474b148ee985 100644 --- a/data/raw/keybindings.json +++ b/data/raw/keybindings.json @@ -1842,6 +1842,12 @@ "category": "DEFAULTMODE", "id": "debug_scent" }, + { + "type": "keybinding", + "name": "View Temperature Map", + "category": "DEFAULTMODE", + "id": "debug_temp" + }, { "type": "keybinding", "name": "Switch Sidebar Style", @@ -2054,6 +2060,12 @@ "category": "DEFAULTMODE", "id": "open_movement" }, + { + "type": "keybinding", + "id": "cast_spell", + "name": "Spellcasting", + "category": "DEFAULTMODE" + }, { "type": "keybinding", "id": "COMPARE", diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index a93d2a4829f95..f5b05d53af530 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -543,7 +543,8 @@ Mods can modify this via `add:traits` and `remove:traits`. [ "textbook_gaswarfare", 8, "" ] // If the name is empty, the recipe is hidden, it will not be shown in the description of the book. ], "difficulty": 3, // Difficulty of success check -"time": 5000, // Time to perform recipe (where 1000 ~= 10 turns ~= 1 minute game time) +"time": "5 m", // Preferred time to perform recipe, can specify in minutes, hours etc. +"time": 5000, // Legacy time to perform recipe (where 1000 ~= 10 turns ~= 1 minute game time). "reversible": false, // Can be disassembled. "autolearn": true, // Automatically learned upon gaining required skills "autolearn" : [ // Automatically learned upon gaining listed skills @@ -592,7 +593,7 @@ Mods can modify this via `add:traits` and `remove:traits`. "description": "Spike Pit", // Description string displayed in the construction menu "category": "DIG", // Construction category "required_skills": [ [ "survival", 1 ] ], // Skill levels required to undertake construction -"time": 30, // Time in minutes required to complete construction +"time": "30 m", // Time required to complete construction. Integers will be read as minutes or a time string can be used. "components": [ [ [ "spear_wood", 4 ], [ "pointy_stick", 4 ] ] ], // Items used in construction "pre_terrain": "t_pit", // Required terrain to build on "post_terrain": "t_pit_spiked" // Terrain type after construction is complete @@ -950,7 +951,7 @@ Books can be defined like this: // additional some book specific entries: "max_level" : 5, // Maximum skill level this book will train to "intelligence" : 11, // Intelligence required to read this book without penalty -"time" : 35, // Time (in minutes) a single read session takes +"time" : "35 m", // Time a single read session takes. An integer will be read in minutes or a time string can be used. "fun" : -2, // Morale bonus/penalty for reading "skill" : "computer", // Skill raised "chapters" : 4, // Number of chapters (for fun only books), each reading "consumes" a chapter. Books with no chapters left are less fun (because the content is already known to the character). @@ -1113,7 +1114,7 @@ Gun mods can be defined like this: "location": "stock", // Mandatory. Where is this gunmod is installed? "mod_targets": [ "crossbow" ], // Mandatory. What kind of weapons can this gunmod be used with? "acceptable_ammo": [ "9mm" ], // Optional filter restricting mod to guns with those base (before modifiers) ammo types -"install_time": 100, // Optional number of moves installation takes. Installation is instantaneous if unspecified +"install_time": "30 s", // Optional time installation takes. Installation is instantaneous if unspecified. An integer will be read as moves or a time string can be used. "ammo_modifier": "57", // Optional field which if specified modifies parent gun to use this ammo type "burst_modifier": 3, // Optional field increasing or decreasing base gun burst size "damage_modifier": -1, // Optional field increasing or decreasing base gun damage diff --git a/src/action.cpp b/src/action.cpp index bb29046061f4c..0147686b3b0e7 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -239,6 +239,8 @@ std::string action_ident( action_id act ) return "fire"; case ACTION_FIRE_BURST: return "fire_burst"; + case ACTION_CAST_SPELL: + return "cast_spell"; case ACTION_SELECT_FIRE_MODE: return "select_fire_mode"; case ACTION_DROP: @@ -307,6 +309,8 @@ std::string action_ident( action_id act ) return "debug"; case ACTION_DISPLAY_SCENT: return "debug_scent"; + case ACTION_DISPLAY_TEMPERATURE: + return "debug_temp"; case ACTION_TOGGLE_DEBUG_MODE: return "debug_mode"; case ACTION_ZOOM_OUT: @@ -406,6 +410,7 @@ bool can_action_change_worldstate( const action_id act ) case ACTION_TOGGLE_FULLSCREEN: case ACTION_DEBUG: case ACTION_DISPLAY_SCENT: + case ACTION_DISPLAY_TEMPERATURE: case ACTION_ZOOM_OUT: case ACTION_ZOOM_IN: case ACTION_TOGGLE_PIXEL_MINIMAP: @@ -802,6 +807,7 @@ action_id handle_action_menu() #endif // TILES REGISTER_ACTION( ACTION_TOGGLE_PANEL_ADM ); REGISTER_ACTION( ACTION_DISPLAY_SCENT ); + REGISTER_ACTION( ACTION_DISPLAY_TEMPERATURE ); REGISTER_ACTION( ACTION_TOGGLE_DEBUG_MODE ); } else if( category == _( "Interact" ) ) { REGISTER_ACTION( ACTION_EXAMINE ); @@ -826,6 +832,7 @@ action_id handle_action_menu() REGISTER_ACTION( ACTION_FIRE ); REGISTER_ACTION( ACTION_RELOAD_ITEM ); REGISTER_ACTION( ACTION_RELOAD_WEAPON ); + REGISTER_ACTION( ACTION_CAST_SPELL ); REGISTER_ACTION( ACTION_SELECT_FIRE_MODE ); REGISTER_ACTION( ACTION_THROW ); REGISTER_ACTION( ACTION_FIRE_BURST ); diff --git a/src/action.h b/src/action.h index 3b862edd99ca2..de209c2c39e01 100644 --- a/src/action.h +++ b/src/action.h @@ -171,6 +171,8 @@ enum action_id : int { ACTION_FIRE_BURST, /** Change fire mode of the current weapon */ ACTION_SELECT_FIRE_MODE, + /** Cast a spell (only if any spells are known) */ + ACTION_CAST_SPELL, /** Open the drop-item menu */ ACTION_DROP, /** Drop items in a given direction */ @@ -293,6 +295,8 @@ enum action_id : int { ACTION_TOGGLE_AUTO_MINING, /** Turn auto foraging on/off */ ACTION_TOGGLE_AUTO_FORAGING, + /** Toggle temperature map */ + ACTION_DISPLAY_TEMPERATURE, /** Not an action, serves as count of enumerated actions */ NUM_ACTIONS /**@}*/ diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index 81cde690c891e..cc8c4f5a899c8 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -43,6 +43,7 @@ #include "output.h" #include "overmapbuffer.h" #include "player.h" +#include "ranged.h" #include "recipe.h" #include "requirements.h" #include "rng.h" @@ -211,6 +212,7 @@ activity_handlers::finish_functions = { { activity_id( "ACT_ROBOT_CONTROL" ), robot_control_finish }, { activity_id( "ACT_HACK_DOOR" ), hack_door_finish }, { activity_id( "ACT_HACK_SAFE" ), hack_safe_finish }, + { activity_id( "ACT_SPELLCASTING" ), spellcasting_finish }, { activity_id( "ACT_STUDY_SPELL" ), study_spell_finish } }; @@ -3591,6 +3593,128 @@ void activity_handlers::hack_safe_finish( player_activity *act, player *p ) act->set_to_null(); } +static void blood_magic( player *p, int cost ) +{ + static std::array part = { { + bp_head, bp_torso, bp_arm_l, bp_arm_r, bp_leg_l, bp_leg_r + } + }; + int max_hp_part = 0; + std::vector uile; + for( int i = 0; i < num_hp_parts; i++ ) { + uilist_entry entry( i, p->hp_cur[i] > cost, i + 49, body_part_hp_bar_ui_text( part[i] ) ); + if( p->hp_cur[max_hp_part] < p->hp_cur[i] ) { + max_hp_part = i; + } + const auto &hp = get_hp_bar( p->hp_cur[i], p->hp_max[i] ); + entry.ctxt = colorize( hp.first, hp.second ); + uile.emplace_back( entry ); + } + int action = -1; + while( action < 0 ) { + action = uilist( _( "Choose part\nto draw blood from." ), uile ); + } + p->hp_cur[action] -= cost; + p->mod_pain( std::max( ( int )1, cost / 3 ) ); +} + +void activity_handlers::spellcasting_finish( player_activity *act, player *p ) +{ + act->set_to_null(); + spell &casting = p->magic.get_spell( spell_id( act->name ) ); + + // choose target for spell (if the spell has a range > 0) + + target_handler th; + std::vector trajectory; + tripoint target = p->pos(); + bool target_is_valid = false; + if( casting.range() > 0 && !casting.is_valid_target( target_none ) ) { + do { + trajectory = th.target_ui( casting ); + if( !trajectory.empty() ) { + target = trajectory.back(); + target_is_valid = casting.is_valid_target( target ); + } else { + target_is_valid = false; + } + if( !target_is_valid ) { + if( query_yn( _( "Stop casting spell? Time spent will be lost." ) ) ) { + return; + } + } + } while( !target_is_valid ); + } + + // no turning back now. it's all said and done. + bool success = 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!" ); + if( !casting.is_max_level() ) { + // still get some experience for trying + casting.gain_exp( exp_gained / 5 ); + p->add_msg_if_player( m_good, _( "You gain %i experience. New total %i." ), exp_gained / 5, + casting.xp() ); + } + return; + } + p->add_msg_if_player( _( "You cast %s!" ), casting.name() ); + + // figure out which function is the effect (maybe change this into how iuse or activity_handlers does it) + const std::string fx = casting.effect(); + if( fx == "pain_split" ) { + spell_effect::pain_split(); + } else if( fx == "move_earth" ) { + spell_effect::move_earth( target ); + } else if( fx == "target_attack" ) { + spell_effect::target_attack( casting, p->pos(), target ); + } else if( fx == "projectile_attack" ) { + spell_effect::projectile_attack( casting, p->pos(), target ); + } else if( fx == "cone_attack" ) { + spell_effect::cone_attack( casting, p->pos(), target ); + } else if( fx == "line_attack" ) { + spell_effect::line_attack( casting, p->pos(), target ); + } else if( fx == "teleport_random" ) { + spell_effect::teleport( casting.range(), casting.range() + casting.aoe() ); + } else if( fx == "spawn_item" ) { + spell_effect::spawn_ethereal_item( casting ); + } else { + debugmsg( "ERROR: Spell effect not defined properly." ); + } + + // pay the cost + int cost = casting.energy_cost(); + switch( casting.energy_source() ) { + case mana_energy: + p->magic.mod_mana( *p, -cost ); + break; + case stamina_energy: + p->stamina -= cost; + break; + case bionic_energy: + p->power_level -= cost; + break; + case hp_energy: + blood_magic( p, cost ); + case none_energy: + default: + break; + } + if( !casting.is_max_level() ) { + // reap the reward + if( casting.get_level() == 0 ) { + casting.gain_level(); + p->add_msg_if_player( m_good, + _( "Something about how this spell works just clicked! You gained a level!" ) ); + } else { + casting.gain_exp( exp_gained ); + p->add_msg_if_player( m_good, _( "You gain %i experience. New total %i." ), exp_gained, + casting.xp() ); + } + } +} + void activity_handlers::study_spell_do_turn( player_activity *act, player *p ) { if( p->fine_detail_vision_mod() > 4 ) { diff --git a/src/activity_handlers.h b/src/activity_handlers.h index e9b6a1dc7f9e2..ae218d78d23d6 100644 --- a/src/activity_handlers.h +++ b/src/activity_handlers.h @@ -95,6 +95,7 @@ void harvest_plot_do_turn( player_activity *act, player *p ); void try_sleep_do_turn( player_activity *act, player *p ); void robot_control_do_turn( player_activity *act, player *p ); void tree_communion_do_turn( player_activity *act, player *p ); +void spellcasting_do_turn( player_activity *act, player *p ); void study_spell_do_turn( player_activity *act, player *p ); // defined in activity_handlers.cpp @@ -153,6 +154,7 @@ void unload_mag_finish( player_activity *act, player *p ); void robot_control_finish( player_activity *act, player *p ); void hack_door_finish( player_activity *act, player *p ); void hack_safe_finish( player_activity *act, player *p ); +void spellcasting_finish( player_activity *act, player *p ); void study_spell_finish( player_activity *act, player *p ); // defined in activity_handlers.cpp diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp new file mode 100644 index 0000000000000..82737ea71c11f --- /dev/null +++ b/src/avatar_action.cpp @@ -0,0 +1,414 @@ +#include "avatar_action.h" + +#include "action.h" +#include "avatar.h" +#include "creature.h" +#include "game.h" +#include "input.h" +#include "item.h" +#include "itype.h" +#include "line.h" +#include "map.h" +#include "mapdata.h" +#include "map_iterator.h" +#include "messages.h" +#include "monster.h" +#include "npc.h" +#include "options.h" +#include "output.h" +#include "player.h" +#include "translations.h" +#include "type_id.h" +#include "veh_type.h" +#include "vehicle.h" +#include "vpart_position.h" +#include "vpart_reference.h" + +#define dbg(x) DebugLog((DebugLevel)(x),D_SDL) << __FILE__ << ":" << __LINE__ << ": " + +static const trait_id trait_BURROW( "BURROW" ); +static const trait_id trait_SHELL2( "SHELL2" ); + +static const efftype_id effect_amigara( "amigara" ); +static const efftype_id effect_pet( "pet" ); +static const efftype_id effect_relax_gas( "relax_gas" ); +static const efftype_id effect_stunned( "stunned" ); + +bool avatar_action::move( avatar &you, map &m, int dx, int dy, int dz ) +{ + if( ( !g->check_safe_mode_allowed() ) || you.has_active_mutation( trait_SHELL2 ) ) { + if( you.has_active_mutation( trait_SHELL2 ) ) { + add_msg( m_warning, _( "You can't move while in your shell. Deactivate it to go mobile." ) ); + } + return false; + } + + tripoint dest_loc; + if( dz == 0 && you.has_effect( effect_stunned ) ) { + dest_loc.x = rng( you.posx() - 1, you.posx() + 1 ); + dest_loc.y = rng( you.posy() - 1, you.posy() + 1 ); + dest_loc.z = you.posz(); + } else { + if( tile_iso && use_tiles && !you.has_destination() ) { + rotate_direction_cw( dx, dy ); + } + dest_loc.x = you.posx() + dx; + dest_loc.y = you.posy() + dy; + dest_loc.z = you.posz() + dz; + } + + if( dest_loc == you.pos() ) { + // Well that sure was easy + return true; + } + + if( m.has_flag( TFLAG_MINEABLE, dest_loc ) && g->mostseen == 0 && + get_option( "AUTO_FEATURES" ) && get_option( "AUTO_MINING" ) && + !m.veh_at( dest_loc ) && !you.is_underwater() && !you.has_effect( effect_stunned ) ) { + if( you.weapon.has_flag( "DIG_TOOL" ) ) { + if( you.weapon.type->can_use( "JACKHAMMER" ) && you.weapon.ammo_sufficient() ) { + you.invoke_item( &you.weapon, "JACKHAMMER", dest_loc ); + you.defer_move( dest_loc ); // don't move into the tile until done mining + return true; + } else if( you.weapon.type->can_use( "PICKAXE" ) ) { + you.invoke_item( &you.weapon, "PICKAXE", dest_loc ); + you.defer_move( dest_loc ); // don't move into the tile until done mining + return true; + } + } + if( you.has_trait( trait_BURROW ) ) { + item burrowing_item( itype_id( "fake_burrowing" ) ); + you.invoke_item( &burrowing_item, "BURROW", dest_loc ); + you.defer_move( dest_loc ); // don't move into the tile until done mining + return true; + } + } + + // by this point we're either walking, running, crouching, or attacking, so update the activity level to match + if( you.get_movement_mode() == "walk" ) { + you.increase_activity_level( LIGHT_EXERCISE ); + } else if( you.get_movement_mode() == "crouch" ) { + you.increase_activity_level( MODERATE_EXERCISE ); + } else { + you.increase_activity_level( ACTIVE_EXERCISE ); + } + + // If the player is *attempting to* move on the X axis, update facing direction of their sprite to match. + const int new_dx = dest_loc.x - you.posx(); + if( new_dx > 0 ) { + you.facing = FD_RIGHT; + } else if( new_dx < 0 ) { + you.facing = FD_LEFT; + } + + if( dz == 0 && ramp_move( you, m, dest_loc ) ) { + // TODO: Make it work nice with automove (if it doesn't do so already?) + return false; + } + + if( you.has_effect( effect_amigara ) ) { + int curdist = INT_MAX; + int newdist = INT_MAX; + const tripoint minp = tripoint( 0, 0, you.posz() ); + const tripoint maxp = tripoint( MAPSIZE_X, MAPSIZE_Y, you.posz() ); + for( const tripoint &pt : m.points_in_rectangle( minp, maxp ) ) { + if( m.ter( pt ) == t_fault ) { + int dist = rl_dist( pt, you.pos() ); + if( dist < curdist ) { + curdist = dist; + } + dist = rl_dist( pt, dest_loc ); + if( dist < newdist ) { + newdist = dist; + } + } + } + if( newdist > curdist ) { + add_msg( m_info, _( "You cannot pull yourself away from the faultline..." ) ); + return false; + } + } + + dbg( D_PEDANTIC_INFO ) << "game:plmove: From (" << + you.posx() << "," << you.posy() << "," << you.posz() << ") to (" << + dest_loc.x << "," << dest_loc.y << "," << dest_loc.z << ")"; + + if( g->disable_robot( dest_loc ) ) { + return false; + } + + // Check if our movement is actually an attack on a monster or npc + // Are we displacing a monster? + + bool attacking = false; + if( g->critter_at( dest_loc ) ) { + attacking = true; + } + + if( !you.move_effects( attacking ) ) { + you.moves -= 100; + return false; + } + + if( monster *const mon_ptr = g->critter_at( dest_loc, true ) ) { + monster &critter = *mon_ptr; + if( critter.friendly == 0 && + !critter.has_effect( effect_pet ) ) { + if( you.has_destination() ) { + add_msg( m_warning, _( "Monster in the way. Auto-move canceled." ) ); + add_msg( m_info, _( "Click directly on monster to attack." ) ); + you.clear_destination(); + return false; + } else { + // fighting is hard work! + you.increase_activity_level( EXTRA_EXERCISE ); + } + if( you.has_effect( effect_relax_gas ) ) { + if( one_in( 8 ) ) { + add_msg( m_good, _( "Your willpower asserts itself, and so do you!" ) ); + } else { + you.moves -= rng( 2, 8 ) * 10; + add_msg( m_bad, _( "You're too pacified to strike anything..." ) ); + return false; + } + } + you.melee_attack( critter, true ); + if( critter.is_hallucination() ) { + critter.die( &you ); + } + g->draw_hit_mon( dest_loc, critter, critter.is_dead() ); + return false; + } else if( critter.has_flag( MF_IMMOBILE ) ) { + add_msg( m_info, _( "You can't displace your %s." ), critter.name() ); + return false; + } + // Successful displacing is handled (much) later + } + // If not a monster, maybe there's an NPC there + if( npc *const np_ = g->critter_at( dest_loc ) ) { + npc &np = *np_; + if( you.has_destination() ) { + add_msg( _( "NPC in the way, Auto-move canceled." ) ); + add_msg( m_info, _( "Click directly on NPC to attack." ) ); + you.clear_destination(); + return false; + } + + if( !np.is_enemy() ) { + g->npc_menu( np ); + return false; + } + + you.melee_attack( np, true ); + // fighting is hard work! + you.increase_activity_level( EXTRA_EXERCISE ); + np.make_angry(); + return false; + } + + // GRAB: pre-action checking. + int dpart = -1; + const optional_vpart_position vp0 = m.veh_at( you.pos() ); + vehicle *const veh0 = veh_pointer_or_null( vp0 ); + const optional_vpart_position vp1 = m.veh_at( dest_loc ); + vehicle *const veh1 = veh_pointer_or_null( vp1 ); + + bool veh_closed_door = false; + bool outside_vehicle = ( veh0 == nullptr || veh0 != veh1 ); + if( veh1 != nullptr ) { + dpart = veh1->next_part_to_open( vp1->part_index(), outside_vehicle ); + veh_closed_door = dpart >= 0 && !veh1->parts[dpart].open; + } + + if( veh0 != nullptr && abs( veh0->velocity ) > 100 ) { + if( veh1 == nullptr ) { + if( query_yn( _( "Dive from moving vehicle?" ) ) ) { + g->moving_vehicle_dismount( dest_loc ); + } + return false; + } else if( veh1 != veh0 ) { + add_msg( m_info, _( "There is another vehicle in the way." ) ); + return false; + } else if( !vp1.part_with_feature( "BOARDABLE", true ) ) { + add_msg( m_info, _( "That part of the vehicle is currently unsafe." ) ); + return false; + } + } + + bool toSwimmable = m.has_flag( "SWIMMABLE", dest_loc ); + bool toDeepWater = m.has_flag( TFLAG_DEEP_WATER, dest_loc ); + bool fromSwimmable = m.has_flag( "SWIMMABLE", you.pos() ); + bool fromDeepWater = m.has_flag( TFLAG_DEEP_WATER, you.pos() ); + bool fromBoat = veh0 != nullptr && veh0->is_in_water(); + bool toBoat = veh1 != nullptr && veh1->is_in_water(); + + if( toSwimmable && toDeepWater && !toBoat ) { // Dive into water! + // Requires confirmation if we were on dry land previously + if( ( fromSwimmable && fromDeepWater && !fromBoat ) || query_yn( _( "Dive into the water?" ) ) ) { + if( ( !fromDeepWater || fromBoat ) && you.swim_speed() < 500 ) { + add_msg( _( "You start swimming." ) ); + add_msg( m_info, _( "%s to dive underwater." ), + press_x( ACTION_MOVE_DOWN ) ); + } + g->plswim( dest_loc ); + } + + g->on_move_effects(); + return true; + } + + //Wooden Fence Gate (or equivalently walkable doors): + // open it if we are walking + // vault over it if we are running + if( m.passable_ter_furn( dest_loc ) + && you.get_movement_mode() == "walk" + && m.open_door( dest_loc, !m.is_outside( you.pos() ) ) ) { + you.moves -= 100; + // if auto-move is on, continue moving next turn + if( you.has_destination() ) { + you.defer_move( dest_loc ); + } + return true; + } + + if( g->walk_move( dest_loc ) ) { + return true; + } + + if( g->phasing_move( dest_loc ) ) { + return true; + } + + if( veh_closed_door ) { + if( outside_vehicle ) { + veh1->open_all_at( dpart ); + } else { + veh1->open( dpart ); + add_msg( _( "You open the %1$s's %2$s." ), veh1->name, + veh1->part_info( dpart ).name() ); + } + you.moves -= 100; + // if auto-move is on, continue moving next turn + if( you.has_destination() ) { + you.defer_move( dest_loc ); + } + return true; + } + + if( m.furn( dest_loc ) != f_safe_c && m.open_door( dest_loc, !m.is_outside( you.pos() ) ) ) { + you.moves -= 100; + // if auto-move is on, continue moving next turn + if( you.has_destination() ) { + you.defer_move( dest_loc ); + } + return true; + } + + // Invalid move + const bool waste_moves = you.is_blind() || you.has_effect( effect_stunned ); + if( waste_moves || dest_loc.z != you.posz() ) { + add_msg( _( "You bump into the %s!" ), m.obstacle_name( dest_loc ) ); + // Only lose movement if we're blind + if( waste_moves ) { + you.moves -= 100; + } + } else if( m.ter( dest_loc ) == t_door_locked || m.ter( dest_loc ) == t_door_locked_peep || + m.ter( dest_loc ) == t_door_locked_alarm || m.ter( dest_loc ) == t_door_locked_interior ) { + // Don't drain move points for learning something you could learn just by looking + add_msg( _( "That door is locked!" ) ); + } else if( m.ter( dest_loc ) == t_door_bar_locked ) { + add_msg( _( "You rattle the bars but the door is locked!" ) ); + } + return false; +} + +bool avatar_action::ramp_move( avatar &you, map &m, const tripoint &dest_loc ) +{ + if( dest_loc.z != you.posz() ) { + // No recursive ramp_moves + return false; + } + + // We're moving onto a tile with no support, check if it has a ramp below + if( !m.has_floor_or_support( dest_loc ) ) { + tripoint below( dest_loc.x, dest_loc.y, dest_loc.z - 1 ); + if( m.has_flag( TFLAG_RAMP, below ) ) { + // But we're moving onto one from above + const tripoint dp = dest_loc - you.pos(); + move( you, m, dp.x, dp.y, -1 ); + // No penalty for misaligned stairs here + // Also cheaper than climbing up + return true; + } + + return false; + } + + if( !m.has_flag( TFLAG_RAMP, you.pos() ) || + m.passable( dest_loc ) ) { + return false; + } + + // Try to find an aligned end of the ramp that will make our climb faster + // Basically, finish walking on the stairs instead of pulling self up by hand + bool aligned_ramps = false; + for( const tripoint &pt : m.points_in_radius( you.pos(), 1 ) ) { + if( rl_dist( pt, dest_loc ) < 2 && m.has_flag( "RAMP_END", pt ) ) { + aligned_ramps = true; + break; + } + } + + const tripoint above_u( you.posx(), you.posy(), you.posz() + 1 ); + if( m.has_floor_or_support( above_u ) ) { + add_msg( m_warning, _( "You can't climb here - there's a ceiling above." ) ); + return false; + } + + const tripoint dp = dest_loc - you.pos(); + const tripoint old_pos = you.pos(); + move( you, m, dp.x, dp.y, 1 ); + // We can't just take the result of the above function here + if( you.pos() != old_pos ) { + you.moves -= 50 + ( aligned_ramps ? 0 : 50 ); + } + + return true; +} + +static float rate_critter( const Creature &c ) +{ + const npc *np = dynamic_cast( &c ); + if( np != nullptr ) { + return np->weapon_value( np->weapon ); + } + + const monster *m = dynamic_cast( &c ); + return m->type->difficulty; +} + +void avatar_action::autoattack( avatar &you, map &m ) +{ + int reach = you.weapon.reach_range( you ); + auto critters = you.get_hostile_creatures( reach ); + if( critters.empty() ) { + add_msg( m_info, _( "No hostile creature in reach. Waiting a turn." ) ); + if( g->check_safe_mode_allowed() ) { + you.pause(); + } + return; + } + + Creature &best = **std::max_element( critters.begin(), critters.end(), + []( const Creature * l, const Creature * r ) { + return rate_critter( *l ) > rate_critter( *r ); + } ); + + const tripoint diff = best.pos() - you.pos(); + if( abs( diff.x ) <= 1 && abs( diff.y ) <= 1 && diff.z == 0 ) { + move( you, m, diff.x, diff.y ); + return; + } + + you.reach_attack( best.pos() ); +} diff --git a/src/avatar_action.h b/src/avatar_action.h new file mode 100644 index 0000000000000..80e2b925b01b2 --- /dev/null +++ b/src/avatar_action.h @@ -0,0 +1,32 @@ +#pragma once +#ifndef AVATAR_ACTION_H +#define AVATAR_ACTION_H + +#include "enums.h" + +class avatar; +class map; +struct point; + +namespace avatar_action +{ +// Standard movement; handles attacks, traps, &c. Returns false if auto move +// should be canceled +bool move( avatar &you, map &m, int dx, int dy, int dz = 0 ); +inline bool move( avatar &you, map &m, const tripoint &d ) +{ + return move( you, m, d.x, d.y, d.z ); +} +inline bool move( avatar &you, map &m, const point &d ) +{ + return move( you, m, d.x, d.y ); +} + +// Handle moving from a ramp +bool ramp_move( avatar &you, map &m, const tripoint &dest ); + +void autoattack( avatar &you, map &m ); +} + + +#endif // !AVATAR_MOVE_H diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp index 4d257505c37bb..f8010a40d3645 100644 --- a/src/cata_tiles.cpp +++ b/src/cata_tiles.cpp @@ -1072,11 +1072,41 @@ void cata_tiles::draw( int destx, int desty, const tripoint ¢er, int width, const int scent_value = g->scent.get( {x, y, center.z} ); if( scent_value > 0 ) { overlay_strings.emplace( player_to_screen( x, y ) + point( tile_width / 2, 0 ), - formatted_text( std::to_string( scent_value ), 11, + formatted_text( std::to_string( scent_value ), 8 + catacurses::yellow, NORTH ) ); } } + // Add temperature value to the overlay_strings list for every visible tile when displaying temperature + if( g->displaying_temperature ) { + int temp_value = g->weather.get_temperature( {x, y, center.z} ); + int ctemp = temp_to_celsius( temp_value ); + short col; + const short bold = 8; + if( ctemp > 40 ) { + col = catacurses::red; + } else if( ctemp > 25 ) { + col = catacurses::yellow + bold; + } else if( ctemp > 10 ) { + col = catacurses::green + bold; + } else if( ctemp > 0 ) { + col = catacurses::white + bold; + } else if( ctemp > -10 ) { + col = catacurses::cyan + bold; + } else { + col = catacurses::blue + bold; + } + if( get_option( "USE_CELSIUS" ) == "celsius" ) { + temp_value = temp_to_celsius( temp_value ); + } else if( get_option( "USE_CELSIUS" ) == "kelvin" ) { + temp_value = temp_to_kelvin( temp_value ); + + } + overlay_strings.emplace( player_to_screen( x, y ) + point( tile_width / 2, 0 ), + formatted_text( std::to_string( temp_value ), col, + NORTH ) ); + } + if( apply_vision_effects( temp, g->m.get_visibility( ch.visibility_cache[x][y], cache ) ) ) { int height_3d = 0; draw_terrain_from_memory( tripoint( x, y, center.z ), height_3d ); diff --git a/src/construction.cpp b/src/construction.cpp index 9eabb139eabe8..42bc2d73e6ba6 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -1275,9 +1275,11 @@ void load_construction( JsonObject &jo ) } con.category = jo.get_string( "category", "OTHER" ); - // constructions use different time units in json, this makes it compatible - // with recipes/requirements, TODO: should be changed in json - con.time = to_moves( time_duration::from_minutes( jo.get_int( "time" ) ) ); + if( jo.has_int( "time" ) ) { + con.time = to_moves( time_duration::from_minutes( jo.get_int( "time" ) ) ); + } else if( jo.has_string( "time" ) ) { + con.time = to_moves( time_duration::read_from_json_string( *jo.get_raw( "time" ) ) ); + } if( jo.has_string( "using" ) ) { con.requirements = requirement_id( jo.get_string( "using" ) ); diff --git a/src/crafting.cpp b/src/crafting.cpp index faa6a15974a69..516cdc47b601f 100644 --- a/src/crafting.cpp +++ b/src/crafting.cpp @@ -570,6 +570,9 @@ static void finalize_crafted_item( item &newit ) if( newit.is_food() ) { set_item_food( newit ); } + // TODO for now this assumes player is doing the crafting + // this will need to be updated when NPCs do crafting + newit.set_owner( g->faction_manager_ptr->get( faction_id( "your_followers" ) ) ); } static cata::optional wield_craft( player &p, item &craft ) diff --git a/src/creature.cpp b/src/creature.cpp index 3f12c81b72b0e..c0a81cc154f0c 100644 --- a/src/creature.cpp +++ b/src/creature.cpp @@ -522,8 +522,9 @@ void Creature::deal_melee_hit( Creature *source, int hit_spread, bool critical_h void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack &attack, bool print_messages ) { + const bool magic = attack.proj.proj_effects.count( "magic" ) > 0; const double missed_by = attack.missed_by; - if( missed_by >= 1.0 ) { + if( missed_by >= 1.0 && !magic ) { // Total miss return; } @@ -541,7 +542,7 @@ void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack const double dodge_rescaled = avoid_roll / static_cast( diff_roll ); const double goodhit = missed_by + std::max( 0.0, std::min( 1.0, dodge_rescaled ) ) ; - if( goodhit >= 1.0 ) { + if( goodhit >= 1.0 && !magic ) { attack.missed_by = 1.0; // Arbitrary value if( !print_messages ) { return; @@ -571,7 +572,7 @@ void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack body_part bp_hit; double hit_value = missed_by + rng_float( -0.5, 0.5 ); // Headshots considered elsewhere - if( hit_value <= 0.4 ) { + if( hit_value <= 0.4 || magic ) { bp_hit = bp_torso; } else if( one_in( 4 ) ) { if( one_in( 2 ) ) { @@ -591,8 +592,9 @@ void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack std::string message; game_message_type gmtSCTcolor = m_neutral; - - if( goodhit < accuracy_headshot ) { + if( magic ) { + damage_mult *= rng_float( 0.9, 1.1 ); + } else if( goodhit < accuracy_headshot ) { message = _( "Headshot!" ); gmtSCTcolor = m_headshot; damage_mult *= rng_float( 1.95, 2.05 ); diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp index e2507d00762f6..d35a4693a4afe 100644 --- a/src/debug_menu.cpp +++ b/src/debug_menu.cpp @@ -63,6 +63,7 @@ #include "vpart_position.h" #include "rng.h" #include "signal.h" +#include "magic.h" #if defined(TILES) #include "sdl_wrappers.h" @@ -116,6 +117,10 @@ enum debug_menu_index { DEBUG_TEST_WEATHER, DEBUG_SAVE_SCREENSHOT, DEBUG_GAME_REPORT, + DEBUG_DISPLAY_SCENTS_LOCAL, + DEBUG_DISPLAY_TEMP, + DEBUG_LEARN_SPELLS, + DEBUG_LEVEL_SPELLS }; class mission_debug @@ -133,7 +138,7 @@ class mission_debug static int player_uilist() { - const std::vector uilist_initializer = { + std::vector uilist_initializer = { { uilist_entry( DEBUG_MUTATE, true, 'M', _( "Mutate" ) ) }, { uilist_entry( DEBUG_CHANGE_SKILLS, true, 's', _( "Change all skills" ) ) }, { uilist_entry( DEBUG_LEARN_MA, true, 'l', _( "Learn all melee styles" ) ) }, @@ -142,6 +147,12 @@ static int player_uilist() { uilist_entry( DEBUG_DAMAGE_SELF, true, 'd', _( "Damage self" ) ) }, { uilist_entry( DEBUG_SET_AUTOMOVE, true, 'a', _( "Set automove route" ) ) }, }; + if( !spell_type::get_all().empty() ) { + uilist_initializer.emplace_back( uilist_entry( DEBUG_LEARN_SPELLS, true, 'S', + _( "Learn all spells" ) ) ); + uilist_initializer.emplace_back( uilist_entry( DEBUG_LEVEL_SPELLS, true, 'L', + _( "Level a spell" ) ) ); + } return uilist( _( "Player..." ), uilist_initializer ); } @@ -159,9 +170,11 @@ static int info_uilist( bool display_all_entries = true ) { uilist_entry( DEBUG_GAME_STATE, true, 'g', _( "Check game state" ) ) }, { uilist_entry( DEBUG_DISPLAY_HORDES, true, 'h', _( "Display hordes" ) ) }, { uilist_entry( DEBUG_TEST_IT_GROUP, true, 'i', _( "Test item group" ) ) }, - { uilist_entry( DEBUG_SHOW_SOUND, true, 's', _( "Show sound clustering" ) ) }, + { uilist_entry( DEBUG_SHOW_SOUND, true, 'c', _( "Show sound clustering" ) ) }, { uilist_entry( DEBUG_DISPLAY_WEATHER, true, 'w', _( "Display weather" ) ) }, { uilist_entry( DEBUG_DISPLAY_SCENTS, true, 'S', _( "Display overmap scents" ) ) }, + { uilist_entry( DEBUG_DISPLAY_SCENTS_LOCAL, true, 's', _( "Toggle display local scents" ) ) }, + { uilist_entry( DEBUG_DISPLAY_TEMP, true, 'T', _( "Toggle display temperature" ) ) }, { uilist_entry( DEBUG_SHOW_MUT_CAT, true, 'm', _( "Show mutation category levels" ) ) }, { uilist_entry( DEBUG_BENCHMARK, true, 'b', _( "Draw benchmark (X seconds)" ) ) }, { uilist_entry( DEBUG_TRAIT_GROUP, true, 't', _( "Test trait group" ) ) }, @@ -1220,6 +1233,14 @@ void debug() case DEBUG_DISPLAY_SCENTS: ui::omap::display_scents(); break; + case DEBUG_DISPLAY_SCENTS_LOCAL: + g->displaying_temperature = false; + g->displaying_scent = !g->displaying_scent; + break; + case DEBUG_DISPLAY_TEMP: + g->displaying_scent = false; + g->displaying_temperature = !g->displaying_temperature; + break; case DEBUG_CHANGE_TIME: { auto set_turn = [&]( const int initial, const int factor, const char *const msg ) { const auto text = string_input_popup() @@ -1411,7 +1432,55 @@ void debug() #endif popup( popup_msg ); } + break; + case DEBUG_LEARN_SPELLS: + if ( spell_type::get_all().empty() ) { + add_msg( m_bad, _( "There are no spells to learn. You must install a mod that adds some." ) ); + } + else { + for ( const spell_type &learn : spell_type::get_all() ) { + g->u.magic.learn_spell( &learn, g->u, true ); + } + add_msg( m_good, _( "You have become an Archwizardpriest! What will you do with your newfound power?" ) ); + } + break; + case DEBUG_LEVEL_SPELLS: { + std::vector spells = g->u.magic.get_spells(); + if( spells.empty() ) { + add_msg( m_bad, _( "Try learning some spells first." ) ); + return; + } + std::vector uiles; + { + uilist_entry uile( _( "Spell" ) ); + uile.ctxt = string_format( "%3s %3s", _( "LVL" ), _( "MAX" ) ); + uile.enabled = false; + uile.force_color = c_light_blue; + uiles.emplace_back( uile ); + } + int retval = 0; + for( spell *sp : spells ) { + uilist_entry uile( sp->name() ); + uile.ctxt = string_format( "%3d %3d", sp->get_level(), sp->get_max_level() ); + uile.retval = retval++; + uile.enabled = !sp->is_max_level(); + uiles.emplace_back( uile ); + } + int action = uilist( _( "Debug level spell:" ), uiles ); + if( action < 0 ) { + return; + } + int desired_level = 0; + int cur_level = spells[action]->get_level(); + query_int( desired_level, _( "Desired Spell Level: (Current %d)" ), cur_level ); + desired_level = std::min( desired_level, spells[action]->get_max_level() ); + while( cur_level < desired_level ) { + spells[action]->gain_level(); + cur_level = spells[action]->get_level(); + } + add_msg( m_good, _( "%s is now level %d!" ), spells[action]->name(), spells[action]->get_level() ); break; + } } catacurses::erase(); m.invalidate_map_cache( g->get_levz() ); diff --git a/src/field.cpp b/src/field.cpp index 25f59fa3f7f43..7fd6384a4f4f1 100644 --- a/src/field.cpp +++ b/src/field.cpp @@ -436,6 +436,42 @@ const std::array fieldlist = { { false }, + { + "fd_cold_air1", + {"", "", ""}, '&', -1, + {def_c_white, def_c_blue, def_c_blue}, {true, true, true}, {false, false, false}, 50_minutes, + {0, 0, 0}, + GAS, + false + }, + + { + "fd_cold_air2", + {"", "", ""}, '&', -1, + {def_c_white, def_c_blue, def_c_blue}, {true, true, true}, {false, false, false}, 50_minutes, + {0, 0, 0}, + GAS, + false + }, + + { + "fd_cold_air3", + {"", "", ""}, '&', -1, + {def_c_white, def_c_blue, def_c_blue}, {true, true, true}, {false, false, false}, 50_minutes, + {0, 0, 0}, + GAS, + false + }, + + { + "fd_cold_air4", + {"", "", ""}, '&', -1, + {def_c_white, def_c_blue, def_c_blue}, {true, true, true}, {false, false, false}, 50_minutes, + {0, 0, 0}, + GAS, + false + }, + { "fd_hot_air1", {"", "", ""}, '&', -1, @@ -745,7 +781,6 @@ bool map::process_fields_in_submap( submap *const current_submap, } } }; - /* Function: create_hot_air Helper function that encapsulates the logic involved in creating hot air. @@ -1450,7 +1485,10 @@ bool map::process_fields_in_submap( submap *const current_submap, spread_gas( cur, p, curtype, 15, 1_minutes ); break; } - + case fd_cold_air1: + case fd_cold_air2: + case fd_cold_air3: + case fd_cold_air4: case fd_hot_air1: case fd_hot_air2: case fd_hot_air3: diff --git a/src/field.h b/src/field.h index 5c01ecb883aa9..f3ae6d7a1f877 100644 --- a/src/field.h +++ b/src/field.h @@ -103,6 +103,10 @@ enum field_id : int { fd_incendiary, fd_relax_gas, fd_fungal_haze, + fd_cold_air1, + fd_cold_air2, + fd_cold_air3, + fd_cold_air4, fd_hot_air1, fd_hot_air2, fd_hot_air3, diff --git a/src/game.cpp b/src/game.cpp index afd1593d8defc..596ede24995af 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -66,6 +66,7 @@ #include "line.h" #include "live_view.h" #include "loading_ui.h" +#include "magic.h" #include "map.h" #include "map_item_stack.h" #include "map_iterator.h" @@ -262,10 +263,11 @@ game::game() : uquit( QUIT_NO ), new_game( false ), displaying_scent( false ), + displaying_temperature( false ), safe_mode( SAFE_MODE_ON ), pixel_minimap_option( 0 ), - u_shared_ptr( &u, null_deleter{} ), mostseen( 0 ), + u_shared_ptr( &u, null_deleter{} ), safe_mode_warning_logged( false ), next_npc_id( 1 ), next_mission_id( 1 ), @@ -1745,6 +1747,10 @@ int get_convection_temperature( const tripoint &location ) temp_mod += tile_strength_mod( location, fd_hot_air2, 6, 16, 20 ); temp_mod += tile_strength_mod( location, fd_hot_air3, 16, 40, 70 ); temp_mod += tile_strength_mod( location, fd_hot_air4, 70, 100, 160 ); + temp_mod -= tile_strength_mod( location, fd_cold_air1, 2, 6, 10 ); + temp_mod -= tile_strength_mod( location, fd_cold_air2, 6, 16, 20 ); + temp_mod -= tile_strength_mod( location, fd_cold_air3, 16, 40, 70 ); + temp_mod -= tile_strength_mod( location, fd_cold_air4, 70, 100, 160 ); return temp_mod; } @@ -2243,6 +2249,7 @@ input_context get_default_mode_input_context() ctxt.register_action( "unload" ); ctxt.register_action( "throw" ); ctxt.register_action( "fire" ); + ctxt.register_action( "cast_spell" ); ctxt.register_action( "fire_burst" ); ctxt.register_action( "select_fire_mode" ); ctxt.register_action( "drop" ); @@ -2287,6 +2294,7 @@ input_context get_default_mode_input_context() ctxt.register_action( "open_world_mods" ); ctxt.register_action( "debug" ); ctxt.register_action( "debug_scent" ); + ctxt.register_action( "debug_temp" ); ctxt.register_action( "debug_mode" ); ctxt.register_action( "zoom_out" ); ctxt.register_action( "zoom_in" ); @@ -3164,6 +3172,9 @@ void game::draw_panels( size_t column, size_t index, bool force_draw ) } log_height = std::max( TERMY - log_height, 3 ); for( const auto &panel : mgr.get_current_layout() ) { + if( !panel.render() ) { + continue; + } // height clamped to window height. int h = std::min( panel.get_height(), TERMY - y ); if( h == -2 ) { @@ -6502,6 +6513,7 @@ look_around_result game::look_around( catacurses::window w_info, tripoint ¢e ctxt.register_action( "CENTER" ); ctxt.register_action( "debug_scent" ); + ctxt.register_action( "debug_temp" ); ctxt.register_action( "CONFIRM" ); ctxt.register_action( "QUIT" ); ctxt.register_action( "HELP_KEYBINDINGS" ); @@ -6627,6 +6639,10 @@ look_around_result game::look_around( catacurses::window w_info, tripoint ¢e if( !MAP_SHARING::isCompetitive() || MAP_SHARING::isDebugger() ) { display_scent(); } + } else if( action == "debug_temp" ) { + if( !MAP_SHARING::isCompetitive() || MAP_SHARING::isDebugger() ) { + display_temperature(); + } } else if( action == "EXTENDED_DESCRIPTION" ) { extended_description( lp ); } else if( action == "CENTER" ) { @@ -8995,348 +9011,6 @@ bool game::prompt_dangerous_tile( const tripoint &dest_loc ) const return true; } -bool game::plmove( int dx, int dy, int dz ) -{ - if( ( !check_safe_mode_allowed() ) || u.has_active_mutation( trait_SHELL2 ) ) { - if( u.has_active_mutation( trait_SHELL2 ) ) { - add_msg( m_warning, _( "You can't move while in your shell. Deactivate it to go mobile." ) ); - } - return false; - } - - tripoint dest_loc; - if( dz == 0 && u.has_effect( effect_stunned ) ) { - dest_loc.x = rng( u.posx() - 1, u.posx() + 1 ); - dest_loc.y = rng( u.posy() - 1, u.posy() + 1 ); - dest_loc.z = u.posz(); - } else { - if( tile_iso && use_tiles && !u.has_destination() ) { - rotate_direction_cw( dx, dy ); - } - dest_loc.x = u.posx() + dx; - dest_loc.y = u.posy() + dy; - dest_loc.z = u.posz() + dz; - } - - if( dest_loc == u.pos() ) { - // Well that sure was easy - return true; - } - - if( m.has_flag( TFLAG_MINEABLE, dest_loc ) && mostseen == 0 && - get_option( "AUTO_FEATURES" ) && get_option( "AUTO_MINING" ) && - !m.veh_at( dest_loc ) && !u.is_underwater() && !u.has_effect( effect_stunned ) ) { - if( u.weapon.has_flag( "DIG_TOOL" ) ) { - if( u.weapon.type->can_use( "JACKHAMMER" ) && u.weapon.ammo_sufficient() ) { - u.invoke_item( &u.weapon, "JACKHAMMER", dest_loc ); - u.defer_move( dest_loc ); // don't move into the tile until done mining - return true; - } else if( u.weapon.type->can_use( "PICKAXE" ) ) { - u.invoke_item( &u.weapon, "PICKAXE", dest_loc ); - u.defer_move( dest_loc ); // don't move into the tile until done mining - return true; - } - } - if( u.has_trait( trait_BURROW ) ) { - item burrowing_item( itype_id( "fake_burrowing" ) ); - u.invoke_item( &burrowing_item, "BURROW", dest_loc ); - u.defer_move( dest_loc ); // don't move into the tile until done mining - return true; - } - } - - // by this point we're either walking, running, crouching, or attacking, so update the activity level to match - if( u.get_movement_mode() == "walk" ) { - u.increase_activity_level( LIGHT_EXERCISE ); - } else if( u.get_movement_mode() == "crouch" ) { - u.increase_activity_level( MODERATE_EXERCISE ); - } else { - u.increase_activity_level( ACTIVE_EXERCISE ); - } - - // If the player is *attempting to* move on the X axis, update facing direction of their sprite to match. - const int new_dx = dest_loc.x - u.posx(); - if( new_dx > 0 ) { - u.facing = FD_RIGHT; - } else if( new_dx < 0 ) { - u.facing = FD_LEFT; - } - - if( dz == 0 && ramp_move( dest_loc ) ) { - // TODO: Make it work nice with automove (if it doesn't do so already?) - return false; - } - - if( u.has_effect( effect_amigara ) ) { - int curdist = INT_MAX; - int newdist = INT_MAX; - const tripoint minp = tripoint( 0, 0, u.posz() ); - const tripoint maxp = tripoint( MAPSIZE_X, MAPSIZE_Y, u.posz() ); - for( const tripoint &pt : m.points_in_rectangle( minp, maxp ) ) { - if( m.ter( pt ) == t_fault ) { - int dist = rl_dist( pt, u.pos() ); - if( dist < curdist ) { - curdist = dist; - } - dist = rl_dist( pt, dest_loc ); - if( dist < newdist ) { - newdist = dist; - } - } - } - if( newdist > curdist ) { - add_msg( m_info, _( "You cannot pull yourself away from the faultline..." ) ); - return false; - } - } - - dbg( D_PEDANTIC_INFO ) << "game:plmove: From (" << - u.posx() << "," << u.posy() << "," << u.posz() << ") to (" << - dest_loc.x << "," << dest_loc.y << "," << dest_loc.z << ")"; - - if( disable_robot( dest_loc ) ) { - return false; - } - - // Check if our movement is actually an attack on a monster or npc - // Are we displacing a monster? - - bool attacking = false; - if( critter_at( dest_loc ) ) { - attacking = true; - } - - if( !u.move_effects( attacking ) ) { - u.moves -= 100; - return false; - } - - if( monster *const mon_ptr = critter_at( dest_loc, true ) ) { - monster &critter = *mon_ptr; - if( critter.friendly == 0 && - !critter.has_effect( effect_pet ) ) { - if( u.has_destination() ) { - add_msg( m_warning, _( "Monster in the way. Auto-move canceled." ) ); - add_msg( m_info, _( "Click directly on monster to attack." ) ); - u.clear_destination(); - return false; - } else { - // fighting is hard work! - u.increase_activity_level( EXTRA_EXERCISE ); - } - if( u.has_effect( effect_relax_gas ) ) { - if( one_in( 8 ) ) { - add_msg( m_good, _( "Your willpower asserts itself, and so do you!" ) ); - } else { - u.moves -= rng( 2, 8 ) * 10; - add_msg( m_bad, _( "You're too pacified to strike anything..." ) ); - return false; - } - } - u.melee_attack( critter, true ); - if( critter.is_hallucination() ) { - critter.die( &u ); - } - draw_hit_mon( dest_loc, critter, critter.is_dead() ); - return false; - } else if( critter.has_flag( MF_IMMOBILE ) ) { - add_msg( m_info, _( "You can't displace your %s." ), critter.name() ); - return false; - } - // Successful displacing is handled (much) later - } - // If not a monster, maybe there's an NPC there - if( npc *const np_ = critter_at( dest_loc ) ) { - npc &np = *np_; - if( u.has_destination() ) { - add_msg( _( "NPC in the way, Auto-move canceled." ) ); - add_msg( m_info, _( "Click directly on NPC to attack." ) ); - u.clear_destination(); - return false; - } - - if( !np.is_enemy() ) { - npc_menu( np ); - return false; - } - - u.melee_attack( np, true ); - // fighting is hard work! - u.increase_activity_level( EXTRA_EXERCISE ); - np.make_angry(); - return false; - } - - // GRAB: pre-action checking. - int dpart = -1; - const optional_vpart_position vp0 = m.veh_at( u.pos() ); - vehicle *const veh0 = veh_pointer_or_null( vp0 ); - const optional_vpart_position vp1 = m.veh_at( dest_loc ); - vehicle *const veh1 = veh_pointer_or_null( vp1 ); - - bool veh_closed_door = false; - bool outside_vehicle = ( veh0 == nullptr || veh0 != veh1 ); - if( veh1 != nullptr ) { - dpart = veh1->next_part_to_open( vp1->part_index(), outside_vehicle ); - veh_closed_door = dpart >= 0 && !veh1->parts[dpart].open; - } - - if( veh0 != nullptr && abs( veh0->velocity ) > 100 ) { - if( veh1 == nullptr ) { - if( query_yn( _( "Dive from moving vehicle?" ) ) ) { - moving_vehicle_dismount( dest_loc ); - } - return false; - } else if( veh1 != veh0 ) { - add_msg( m_info, _( "There is another vehicle in the way." ) ); - return false; - } else if( !vp1.part_with_feature( "BOARDABLE", true ) ) { - add_msg( m_info, _( "That part of the vehicle is currently unsafe." ) ); - return false; - } - } - - bool toSwimmable = m.has_flag( "SWIMMABLE", dest_loc ); - bool toDeepWater = m.has_flag( TFLAG_DEEP_WATER, dest_loc ); - bool fromSwimmable = m.has_flag( "SWIMMABLE", u.pos() ); - bool fromDeepWater = m.has_flag( TFLAG_DEEP_WATER, u.pos() ); - bool fromBoat = veh0 != nullptr && veh0->is_in_water(); - bool toBoat = veh1 != nullptr && veh1->is_in_water(); - - if( toSwimmable && toDeepWater && !toBoat ) { // Dive into water! - // Requires confirmation if we were on dry land previously - if( ( fromSwimmable && fromDeepWater && !fromBoat ) || query_yn( _( "Dive into the water?" ) ) ) { - if( ( !fromDeepWater || fromBoat ) && u.swim_speed() < 500 ) { - add_msg( _( "You start swimming." ) ); - add_msg( m_info, _( "%s to dive underwater." ), - press_x( ACTION_MOVE_DOWN ) ); - } - plswim( dest_loc ); - } - - on_move_effects(); - return true; - } - - //Wooden Fence Gate (or equivalently walkable doors): - // open it if we are walking - // vault over it if we are running - if( m.passable_ter_furn( dest_loc ) - && u.get_movement_mode() == "walk" - && m.open_door( dest_loc, !m.is_outside( u.pos() ) ) ) { - u.moves -= 100; - // if auto-move is on, continue moving next turn - if( u.has_destination() ) { - u.defer_move( dest_loc ); - } - return true; - } - - if( walk_move( dest_loc ) ) { - return true; - } - - if( phasing_move( dest_loc ) ) { - return true; - } - - if( veh_closed_door ) { - if( outside_vehicle ) { - veh1->open_all_at( dpart ); - } else { - veh1->open( dpart ); - add_msg( _( "You open the %1$s's %2$s." ), veh1->name, - veh1->part_info( dpart ).name() ); - } - u.moves -= 100; - // if auto-move is on, continue moving next turn - if( u.has_destination() ) { - u.defer_move( dest_loc ); - } - return true; - } - - if( m.furn( dest_loc ) != f_safe_c && m.open_door( dest_loc, !m.is_outside( u.pos() ) ) ) { - u.moves -= 100; - // if auto-move is on, continue moving next turn - if( u.has_destination() ) { - u.defer_move( dest_loc ); - } - return true; - } - - // Invalid move - const bool waste_moves = u.is_blind() || u.has_effect( effect_stunned ); - if( waste_moves || dest_loc.z != u.posz() ) { - add_msg( _( "You bump into the %s!" ), m.obstacle_name( dest_loc ) ); - // Only lose movement if we're blind - if( waste_moves ) { - u.moves -= 100; - } - } else if( m.ter( dest_loc ) == t_door_locked || m.ter( dest_loc ) == t_door_locked_peep || - m.ter( dest_loc ) == t_door_locked_alarm || m.ter( dest_loc ) == t_door_locked_interior ) { - // Don't drain move points for learning something you could learn just by looking - add_msg( _( "That door is locked!" ) ); - } else if( m.ter( dest_loc ) == t_door_bar_locked ) { - add_msg( _( "You rattle the bars but the door is locked!" ) ); - } - return false; -} - -bool game::ramp_move( const tripoint &dest_loc ) -{ - if( dest_loc.z != u.posz() ) { - // No recursive ramp_moves - return false; - } - - // We're moving onto a tile with no support, check if it has a ramp below - if( !m.has_floor_or_support( dest_loc ) ) { - tripoint below( dest_loc.x, dest_loc.y, dest_loc.z - 1 ); - if( m.has_flag( TFLAG_RAMP, below ) ) { - // But we're moving onto one from above - const tripoint dp = dest_loc - u.pos(); - plmove( dp.x, dp.y, -1 ); - // No penalty for misaligned stairs here - // Also cheaper than climbing up - return true; - } - - return false; - } - - if( !m.has_flag( TFLAG_RAMP, u.pos() ) || - m.passable( dest_loc ) ) { - return false; - } - - // Try to find an aligned end of the ramp that will make our climb faster - // Basically, finish walking on the stairs instead of pulling self up by hand - bool aligned_ramps = false; - for( const tripoint &pt : m.points_in_radius( u.pos(), 1 ) ) { - if( rl_dist( pt, dest_loc ) < 2 && m.has_flag( "RAMP_END", pt ) ) { - aligned_ramps = true; - break; - } - } - - const tripoint above_u( u.posx(), u.posy(), u.posz() + 1 ); - if( m.has_floor_or_support( above_u ) ) { - add_msg( m_warning, _( "You can't climb here - there's a ceiling above." ) ); - return false; - } - - const tripoint dp = dest_loc - u.pos(); - const tripoint old_pos = u.pos(); - plmove( dp.x, dp.y, 1 ); - // We can't just take the result of the above function here - if( u.pos() != old_pos ) { - u.moves -= 50 + ( aligned_ramps ? 0 : 50 ); - } - - return true; -} - bool game::walk_move( const tripoint &dest_loc ) { const optional_vpart_position vp_here = m.veh_at( u.pos() ); @@ -10202,43 +9876,6 @@ void game::plswim( const tripoint &p ) u.drench( 100, drenchFlags, true ); } -static float rate_critter( const Creature &c ) -{ - const npc *np = dynamic_cast( &c ); - if( np != nullptr ) { - return np->weapon_value( np->weapon ); - } - - const monster *m = dynamic_cast( &c ); - return m->type->difficulty; -} - -void game::autoattack() -{ - int reach = u.weapon.reach_range( u ); - auto critters = u.get_hostile_creatures( reach ); - if( critters.empty() ) { - add_msg( m_info, _( "No hostile creature in reach. Waiting a turn." ) ); - if( check_safe_mode_allowed() ) { - u.pause(); - } - return; - } - - Creature &best = **std::max_element( critters.begin(), critters.end(), - []( const Creature * l, const Creature * r ) { - return rate_critter( *l ) > rate_critter( *r ); - } ); - - const tripoint diff = best.pos() - u.pos(); - if( abs( diff.x ) <= 1 && abs( diff.y ) <= 1 && diff.z == 0 ) { - plmove( diff.x, diff.y ); - return; - } - - u.reach_attack( best.pos() ); -} - void game::fling_creature( Creature *c, const int &dir, float flvel, bool controlled ) { if( c == nullptr ) { @@ -11426,6 +11063,9 @@ void game::teleport( player *p, bool add_teleglow ) void game::display_scent() { if( use_tiles ) { + if( displaying_temperature ) { + displaying_temperature = false; + } displaying_scent = !displaying_scent; } else { int div; @@ -11442,6 +11082,16 @@ void game::display_scent() } } +void game::display_temperature() +{ + if( use_tiles ) { + if( displaying_scent ) { + displaying_scent = false; + } + displaying_temperature = !displaying_temperature; + } +} + void game::init_autosave() { moves_since_last_save = 0; diff --git a/src/game.h b/src/game.h index 1ebe28198fdf9..407688d778e20 100644 --- a/src/game.h +++ b/src/game.h @@ -489,7 +489,7 @@ class game /** Performs a random short-distance teleport on the given player, granting teleglow if needed. */ void teleport( player *p = nullptr, bool add_teleglow = true ); - /** Handles swimming by the player. Called by plmove(). */ + /** Handles swimming by the player. Called by avatar_action::move(). */ void plswim( const tripoint &p ); /** Picks and spawns a random fish from the remaining fish list when a fish is caught. */ void catch_a_monster( std::vector &catchables, const tripoint &pos, player *p, @@ -687,6 +687,15 @@ class game /** Attempt to load first valid save (if any) in world */ bool load( const std::string &world ); + /** Returns true if the menu handled stuff and player shouldn't do anything else */ + bool npc_menu( npc &who ); + + // Handle phasing through walls, returns true if it handled the move + bool phasing_move( const tripoint &dest ); + // Regular movement. Returns false if it failed for any reason + bool walk_move( const tripoint &dest ); + void on_move_effects(); + private: // Game-start procedures void load( const save_t &name ); // Load a player-specific save file @@ -732,29 +741,11 @@ class game /** Check for dangerous stuff at dest_loc, return false if the player decides not to step there */ bool prompt_dangerous_tile( const tripoint &dest_loc ) const; - /** Returns true if the menu handled stuff and player shouldn't do anything else */ - bool npc_menu( npc &who ); - // Standard movement; handles attacks, traps, &c. Returns false if auto move - // should be canceled - bool plmove( int dx, int dy, int dz = 0 ); - inline bool plmove( const tripoint &d ) { - return plmove( d.x, d.y, d.z ); - } - inline bool plmove( const point &d ) { - return plmove( d.x, d.y ); - } // Handle pushing during move, returns true if it handled the move bool grabbed_move( const tripoint &dp ); bool grabbed_veh_move( const tripoint &dp ); bool grabbed_furn_move( const tripoint &dp ); - // Handle moving from a ramp - bool ramp_move( const tripoint &dest ); - // Handle phasing through walls, returns true if it handled the move - bool phasing_move( const tripoint &dest ); - // Regular movement. Returns false if it failed for any reason - bool walk_move( const tripoint &dest ); - void on_move_effects(); void control_vehicle(); // Use vehicle controls '^' void examine( const tripoint &p ); // Examine nearby terrain 'e' @@ -774,7 +765,6 @@ class game void reload( int pos, bool prompt = false ); void reload( item_location &loc, bool prompt = false, bool empty = true ); void mend( int pos = INT_MIN ); - void autoattack(); public: /** Eat food or fuel 'E' (or 'a') */ void eat(); @@ -863,6 +853,10 @@ class game void item_action_menu(); // Displays item action menu + bool is_game_over(); // Returns true if the player quit or died + void death_screen(); // Display our stats, "GAME OVER BOO HOO" + void draw_minimap(); // Draw the 5x5 minimap + public: /** * If there is a robot (that can be disabled), query the player * and try to disable it. @@ -871,11 +865,6 @@ class game * has effectively done nothing. */ bool disable_robot( const tripoint &p ); - - bool is_game_over(); // Returns true if the player quit or died - void death_screen(); // Display our stats, "GAME OVER BOO HOO" - void draw_minimap(); // Draw the 5x5 minimap - public: // Draws the pixel minimap based on the player's current location void draw_pixel_minimap( const catacurses::window &w ); private: @@ -912,6 +901,7 @@ class game // Debug functions void display_scent(); // Displays the scent map + void display_temperature(); // Displays temperature map Creature *is_hostile_within( int distance ); @@ -969,6 +959,7 @@ class game bool debug_pathfinding = false; // show NPC pathfinding on overmap ui bool displaying_scent; + bool displaying_temperature; bool show_panel_adm; bool right_sidebar; @@ -982,6 +973,8 @@ class game int turnssincelastmon; // needed for auto run mode weather_manager weather; + + int mostseen; // # of mons seen last turn; if this increases, set safe_mode to SAFE_MODE_STOP private: std::shared_ptr u_shared_ptr; std::vector> active_npc; @@ -994,7 +987,6 @@ class game std::string list_item_downvote; std::vector> new_seen_mon; - int mostseen; // # of mons seen last turn; if this increases, set safe_mode to SAFE_MODE_STOP bool safe_mode_warning_logged; bool bVMonsterLookFire; int next_npc_id, next_mission_id; // Keep track of UIDs diff --git a/src/handle_action.cpp b/src/handle_action.cpp index d6f167e1a98f7..af88178672bee 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -12,6 +12,7 @@ #include "advanced_inv.h" #include "auto_pickup.h" #include "avatar.h" +#include "avatar_action.h" #include "bionics.h" #include "calendar.h" #include "clzones.h" @@ -29,6 +30,7 @@ #include "help.h" #include "input.h" #include "itype.h" +#include "magic.h" #include "map.h" #include "mapdata.h" #include "mapsharing.h" @@ -1257,6 +1259,100 @@ static void open_movement_mode_menu() } } +static void cast_spell() +{ + player &u = g->u; + + if( u.is_armed() ) { + add_msg( m_bad, _( "You need your hands free to cast spells!" ) ); + return; + } + + std::vector spells = u.magic.spells(); + + if( spells.empty() ) { + add_msg( m_bad, _( "You don't know any spells to cast." ) ); + return; + } + + bool can_cast_spells = false; + std::vector spell_names; + { + uilist_entry dummy( _( "Spell" ) ); + dummy.ctxt = string_format( "%3s %3s %3s %5s %10s %4s %3s", _( "LVL" ), _( "XP%" ), _( "RNG" ), + _( "FAIL%" ), _( "Cast Time" ), _( "Cost" ), _( "DMG" ) ); + dummy.enabled = false; + dummy.text_color = c_light_blue; + dummy.force_color = true; + spell_names.emplace_back( dummy ); + } + for( spell_id sp : spells ) { + spell temp_spell = u.magic.get_spell( sp ); + std::string nm = temp_spell.name(); + uilist_entry entry( nm ); + if( temp_spell.can_cast( u ) ) { + can_cast_spells = true; + } else { + entry.enabled = false; + } + std::string turns = temp_spell.casting_time() >= 100 ? string_format( _( "%i turns" ), + temp_spell.casting_time() / 100 ) : string_format( _( "%i moves" ), temp_spell.casting_time() ); + std::string cost = string_format( "%4i", temp_spell.energy_cost() ); + switch( temp_spell.energy_source() ) { + case mana_energy: + cost = colorize( cost, c_light_blue ); + break; + case stamina_energy: + cost = colorize( cost, c_green ); + break; + case hp_energy: + cost = colorize( cost, c_red ); + break; + case bionic_energy: + cost = colorize( cost, c_yellow ); + break; + case none_energy: + cost = colorize( _( "none" ), c_light_gray ); + break; + default: + debugmsg( "ERROR: %s has invalid energy_type", temp_spell.id().c_str() ); + break; + } + entry.ctxt = string_format( "%3i (%3s) %3i %3i %% %10s %4s %3i", temp_spell.get_level(), + temp_spell.is_max_level() ? _( "MAX" ) : temp_spell.exp_progress(), temp_spell.range(), + static_cast( round( 100.0f * temp_spell.spell_fail( u ) ) ), turns, cost, + temp_spell.damage() ); + spell_names.emplace_back( entry ); + } + + if( !can_cast_spells ) { + add_msg( m_bad, _( "You can't cast any of the spells you know!" ) ); + } + + // if there's only one spell we know, we still want to see its information + // the 0th "spell" is a header + int action = uilist( _( "Choose your spell:" ), spell_names ) - 1; + if( action < 0 ) { + return; + } + + spell sp = u.magic.get_spell( spells[action] ); + + if( !u.magic.has_enough_energy( u, sp ) ) { + add_msg( m_bad, _( "You don't have enough %s to cast the spell." ), sp.energy_string() ); + return; + } + + if( sp.energy_source() == hp_energy && !u.has_quality( quality_id( "CUT" ) ) ) { + add_msg( m_bad, _( "You cannot cast Blood Magic without a cutting implement." ) ); + return; + } + + player_activity cast_spell( activity_id( "ACT_SPELLCASTING" ), sp.casting_time() ); + cast_spell.name = sp.id().c_str(); + u.assign_activity( cast_spell, false ); +} + void game::open_consume_item_menu() { uilist as_m; @@ -1730,6 +1826,10 @@ bool game::handle_action() fire(); break; + case ACTION_CAST_SPELL: + cast_spell(); + break; + case ACTION_FIRE_BURST: { gun_mode_id original_mode = u.weapon.gun_get_mode_id(); if( u.weapon.gun_set_mode( gun_mode_id( "AUTO" ) ) ) { @@ -2074,6 +2174,13 @@ bool game::handle_action() display_scent(); break; + case ACTION_DISPLAY_TEMPERATURE: + if( MAP_SHARING::isCompetitive() && !MAP_SHARING::isDebugger() ) { + break; //don't do anything when sharing and not debugger + } + display_temperature(); + break; + case ACTION_TOGGLE_DEBUG_MODE: if( MAP_SHARING::isCompetitive() && !MAP_SHARING::isDebugger() ) { break; //don't do anything when sharing and not debugger @@ -2099,7 +2206,7 @@ bool game::handle_action() break; case ACTION_AUTOATTACK: - autoattack(); + avatar_action::autoattack( u, m ); break; default: @@ -2133,7 +2240,7 @@ bool game::handle_action() } dest_delta = dest_next; } - continue_auto_move = plmove( dest_delta ); + continue_auto_move = avatar_action::move( u, m, dest_delta ); } } } diff --git a/src/init.cpp b/src/init.cpp index aff010edbf171..78e22ae25a2cf 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -460,6 +460,7 @@ void DynamicDataLoader::unload_data() mutations_category.clear(); mutation_category_trait::reset(); mutation_branch::reset_all(); + spell_type::reset_all(); reset_bionics(); clear_tutorial_messages(); reset_furn_ter(); diff --git a/src/item_factory.cpp b/src/item_factory.cpp index 62d06954c5e9e..e383dd78eab2a 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -789,6 +789,7 @@ void Item_factory::init() add_actor( new mutagen_actor() ); add_actor( new mutagen_iv_actor() ); add_actor( new deploy_tent_actor() ); + add_actor( new learn_spell_actor() ); // An empty dummy group, it will not spawn anything. However, it makes that item group // id valid, so it can be used all over the place without need to explicitly check for it. m_template_groups["EMPTY_GROUP"].reset( new Item_group( Item_group::G_COLLECTION, 100, 0, 0 ) ); @@ -1573,7 +1574,11 @@ void Item_factory::load( islot_book &slot, JsonObject &jo, const std::string &sr assign( jo, "required_level", slot.req, strict, 0, MAX_SKILL ); assign( jo, "fun", slot.fun, strict ); assign( jo, "intelligence", slot.intel, strict, 0 ); - assign( jo, "time", slot.time, strict, 0 ); + if( jo.has_int( "time" ) ) { + slot.time = jo.get_int( "time" ); + } else if( jo.has_string( "time" ) ) { + slot.time = to_minutes( time_duration::read_from_json_string( *jo.get_raw( "time" ) ) ); + } assign( jo, "skill", slot.skill, strict ); assign( jo, "chapters", slot.chapters, strict, 0 ); } @@ -1755,7 +1760,11 @@ void Item_factory::load( islot_gunmod &slot, JsonObject &jo, const std::string & assign( jo, "consume_divisor", slot.consume_divisor ); assign( jo, "ammo_effects", slot.ammo_effects, strict ); assign( jo, "ups_charges", slot.ups_charges ); - assign( jo, "install_time", slot.install_time ); + if( jo.has_int( "time" ) ) { + slot.install_time = jo.get_int( "time" ); + } else if( jo.has_string( "time" ) ) { + slot.install_time = to_moves( time_duration::read_from_json_string( *jo.get_raw( "time" ) ) ); + } if( jo.has_member( "mod_targets" ) ) { slot.usable.clear(); diff --git a/src/itype.h b/src/itype.h index fb400bafd910f..854d469083f48 100644 --- a/src/itype.h +++ b/src/itype.h @@ -310,7 +310,7 @@ struct islot_book { */ int intel = 0; /** - * How long, in 10-turns (aka minutes), it takes to read. + * How long in minutes it takes to read. * "To read" means getting 1 skill point, not all of them. */ int time = 0; diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp index 1e2dbf266116c..9ff807b83debb 100644 --- a/src/iuse_actor.cpp +++ b/src/iuse_actor.cpp @@ -2189,7 +2189,7 @@ int learn_spell_actor::use( player &p, item &, bool, const tripoint & ) const uilist_entry entry( sp_nm ); if( p.magic.knows_spell( sp_id ) ) { const spell sp = p.magic.get_spell( sp_id ); - entry.ctxt = string_format( "Level %u", sp.get_level() ); + entry.ctxt = string_format( _( "Level %u" ), sp.get_level() ); if( sp.is_max_level() ) { entry.ctxt += _( " (Max)" ); entry.enabled = false; diff --git a/src/magic.cpp b/src/magic.cpp index e5dc9de9eefd8..a9ddda127fabb 100644 --- a/src/magic.cpp +++ b/src/magic.cpp @@ -338,8 +338,8 @@ std::string spell::colorized_fail_percent( const player &p ) const { const float fail_fl = spell_fail( p ) * 100.0f; std::string fail_str; - fail_fl == 100.0f ? fail_str = _( "Difficult!" ) : fail_str = _( string_format( "%.1f %% %s", - fail_fl, "Failure Chance" ) ); + fail_fl == 100.0f ? fail_str = _( "Difficult!" ) : fail_str = string_format( "%.1f %% %s", + fail_fl, _( "Failure Chance" ) ); nc_color color; if( fail_fl > 90.0f ) { color = c_magenta; @@ -571,7 +571,6 @@ dealt_damage_instance spell::get_dealt_damage_instance() const { dealt_damage_instance dmg; dmg.set_damage( dmg_type(), damage() ); - add_msg( "%i", damage() ); return dmg; } @@ -667,7 +666,7 @@ void known_magic::learn_spell( const spell_type *sp, player &p, bool force ) debugmsg( "Tried to learn invalid spell" ); return; } - if( !force ) { + if( !force && sp->spell_class != trait_id( "NONE" ) ) { if( can_learn_spell( p, sp->id ) && !p.has_trait( sp->spell_class ) ) { if( query_yn( _( "Learning this spell will make you a %s and lock you out of other unique spells.\nContinue?" ), @@ -880,7 +879,7 @@ void move_earth( const tripoint &target ) add_msg( _( "More debris shifts out of the pit." ) ); } else if( soft_dirt.count( ter_here ) == 1 ) { g->m.ter_set( target, t_pit_shallow ); - add_msg( _( "The earth moves out of the way for you" ) ); + add_msg( _( "The earth moves out of the way for you." ) ); } else if( hard_dirt.count( ter_here ) == 1 ) { g->m.ter_set( target, t_sand ); add_msg( _( "The rocks here are ground into sand." ) ); diff --git a/src/map.cpp b/src/map.cpp index f042b8c17447b..3bbc1f2dd327e 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2738,6 +2738,10 @@ void map::decay_fields_and_scent( const time_duration &amount ) case fd_methsmoke: case fd_relax_gas: case fd_fungal_haze: + case fd_cold_air1: + case fd_cold_air2: + case fd_cold_air3: + case fd_cold_air4: case fd_hot_air1: case fd_hot_air2: case fd_hot_air3: diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp index b5beaf9dfd408..58673b055566b 100644 --- a/src/npctalk_funcs.cpp +++ b/src/npctalk_funcs.cpp @@ -450,7 +450,7 @@ void talk_function::give_equipment( npc &p ) item it = *giving[chosen].loc.get_item(); giving[chosen].loc.remove_item(); popup( _( "%1$s gives you a %2$s" ), p.name, it.tname() ); - + it.set_owner( g->faction_manager_ptr->get( faction_id( "your_followers" ) ) ); g->u.i_add( it ); p.op_of_u.owed -= giving[chosen].price; p.add_effect( effect_asked_for_item, 3_hours ); diff --git a/src/panels.cpp b/src/panels.cpp index b8c8e28538cd9..e93c36b97a9f7 100644 --- a/src/panels.cpp +++ b/src/panels.cpp @@ -59,7 +59,8 @@ const efftype_id effect_got_checked( "got_checked" ); // constructor window_panel::window_panel( std::function - draw_func, const std::string &nm, int ht, int wd, bool def_toggle, bool force_draw ) + draw_func, const std::string &nm, int ht, int wd, bool def_toggle, + std::function render_func, bool force_draw ) { draw = draw_func; name = nm; @@ -68,6 +69,7 @@ window_panel::window_panel( std::function power_stat( const player &u ) return std::make_pair( c_pwr, s_pwr ); } +static std::pair mana_stat( const player &u ) +{ + nc_color c_mana = c_red; + std::string s_mana; + if( u.magic.max_mana( u ) <= 0 ) { + s_mana = "--"; + c_mana = c_light_gray; + } else { + if( u.magic.available_mana() >= u.magic.max_mana( u ) / 2 ) { + c_mana = c_light_blue; + } else if( u.magic.available_mana() >= u.magic.max_mana( u ) / 3 ) { + c_mana = c_yellow; + } + s_mana = to_string( u.magic.available_mana() ); + } + return std::make_pair( c_mana, s_mana ); +} + static nc_color safe_color() { nc_color s_color = g->safe_mode ? c_green : c_red; @@ -1677,10 +1697,31 @@ static void draw_hint( const player &, const catacurses::window &w ) wrefresh( w ); } +static void draw_mana( const player &u, const catacurses::window &w ) +{ + werase( w ); + + auto mana_pair = mana_stat( u ); + mvwprintz( w, 0, getmaxx( w ) - 10, c_light_gray, "Mana" ); + mvwprintz( w, 0, getmaxx( w ) - 5, mana_pair.first, mana_pair.second ); + + wrefresh( w ); +} + // ============ // INITIALIZERS // ============ +static bool spell_panel() +{ + return !spell_type::get_all().empty(); +} + +bool default_render() +{ + return true; +} + static std::vector initialize_default_classic_panels() { std::vector ret; @@ -1688,6 +1729,7 @@ static std::vector initialize_default_classic_panels() ret.emplace_back( window_panel( draw_health_classic, translate_marker( "Health" ), 7, 44, true ) ); ret.emplace_back( window_panel( draw_location_classic, translate_marker( "Location" ), 1, 44, true ) ); + ret.emplace_back( window_panel( draw_mana, translate_marker( "Mana" ), 1, 44, true, spell_panel ) ); ret.emplace_back( window_panel( draw_weather_classic, translate_marker( "Weather" ), 1, 44, true ) ); ret.emplace_back( window_panel( draw_lighting_classic, translate_marker( "Lighting" ), 1, 44, @@ -1699,7 +1741,8 @@ static std::vector initialize_default_classic_panels() true ) ); ret.emplace_back( window_panel( draw_messages_classic, translate_marker( "Log" ), -2, 44, true ) ); #if defined(TILES) - ret.emplace_back( window_panel( draw_mminimap, translate_marker( "Map" ), -1, 44, true, true ) ); + ret.emplace_back( window_panel( draw_mminimap, translate_marker( "Map" ), -1, 44, true, + default_render, true ) ); #endif // TILES ret.emplace_back( window_panel( draw_ai_goal, "AI Needs", 1, 44, false ) ); return ret; @@ -1712,6 +1755,7 @@ static std::vector initialize_default_compact_panels() ret.emplace_back( window_panel( draw_limb2, translate_marker( "Limbs" ), 3, 32, true ) ); ret.emplace_back( window_panel( draw_stealth, translate_marker( "Sound" ), 1, 32, true ) ); ret.emplace_back( window_panel( draw_stats, translate_marker( "Stats" ), 1, 32, true ) ); + ret.emplace_back( window_panel( draw_mana, translate_marker( "Mana" ), 1, 32, true, spell_panel ) ); ret.emplace_back( window_panel( draw_time, translate_marker( "Time" ), 1, 32, true ) ); ret.emplace_back( window_panel( draw_needs, translate_marker( "Needs" ), 3, 32, true ) ); ret.emplace_back( window_panel( draw_env_compact, translate_marker( "Env" ), 6, 32, true ) ); @@ -1720,7 +1764,8 @@ static std::vector initialize_default_compact_panels() ret.emplace_back( window_panel( draw_messages_classic, translate_marker( "Log" ), -2, 32, true ) ); ret.emplace_back( window_panel( draw_compass, translate_marker( "Compass" ), 8, 32, true ) ); #if defined(TILES) - ret.emplace_back( window_panel( draw_mminimap, translate_marker( "Map" ), -1, 32, true, true ) ); + ret.emplace_back( window_panel( draw_mminimap, translate_marker( "Map" ), -1, 32, true, + default_render, true ) ); #endif // TILES ret.emplace_back( window_panel( draw_ai_goal, "AI Needs", 1, 32, false ) ); @@ -1734,6 +1779,7 @@ static std::vector initialize_default_label_panels() ret.emplace_back( window_panel( draw_hint, translate_marker( "Hint" ), 1, 32, true ) ); ret.emplace_back( window_panel( draw_limb, translate_marker( "Limbs" ), 3, 32, true ) ); ret.emplace_back( window_panel( draw_char, translate_marker( "Movement" ), 3, 32, true ) ); + ret.emplace_back( window_panel( draw_mana, translate_marker( "Mana" ), 1, 32, true, spell_panel ) ); ret.emplace_back( window_panel( draw_stat, translate_marker( "Stats" ), 3, 32, true ) ); ret.emplace_back( window_panel( draw_veh_padding, translate_marker( "Vehicle" ), 1, 32, true ) ); ret.emplace_back( window_panel( draw_env1, translate_marker( "Location" ), 5, 32, true ) ); @@ -1745,7 +1791,8 @@ static std::vector initialize_default_label_panels() ret.emplace_back( window_panel( draw_compass_padding, translate_marker( "Compass" ), 8, 32, true ) ); #if defined(TILES) - ret.emplace_back( window_panel( draw_mminimap, translate_marker( "Map" ), -1, 32, true, true ) ); + ret.emplace_back( window_panel( draw_mminimap, translate_marker( "Map" ), -1, 32, true, + default_render, true ) ); #endif // TILES ret.emplace_back( window_panel( draw_ai_goal, "AI Needs", 1, 32, false ) ); diff --git a/src/panels.h b/src/panels.h index cf10dadcfc4ad..83916a973d984 100644 --- a/src/panels.h +++ b/src/panels.h @@ -24,13 +24,17 @@ enum face_type : int { num_face_types }; +bool default_render(); + class window_panel { public: window_panel( std::function draw_func, - const std::string &nm, int ht, int wd, bool default_toggle, bool force_draw = false ); + const std::string &nm, int ht, int wd, bool default_toggle, + std::function render_func = default_render, bool force_draw = false ); std::function draw; + std::function render; int get_height() const; int get_width() const; std::string get_name() const; diff --git a/src/player.cpp b/src/player.cpp index bf51bfc285cb9..e6a6f8a2bd0fb 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -40,6 +40,7 @@ #include "item_location.h" #include "itype.h" #include "iuse_actor.h" +#include "magic.h" #include "map.h" #include "map_iterator.h" #include "mapdata.h" @@ -4003,6 +4004,9 @@ void player::update_body( const time_point &from, const time_point &to ) { update_stamina( to_turns( to - from ) ); update_stomach( from, to ); + if( ticks_between( from, to, 10_turns ) > 0 ) { + magic.update_mana( *this, to_turns( 10_turns ) ); + } const int five_mins = ticks_between( from, to, 5_minutes ); if( five_mins > 0 ) { check_needs_extremes(); @@ -10570,7 +10574,9 @@ void player::wake_up() remove_effect( effect_sleep ); remove_effect( effect_slept_through_alarm ); remove_effect( effect_lying_down ); - remove_effect( effect_alarm_clock ); + // Do not remove effect_alarm_clock now otherwise it invalidates an effect iterator in player::process_effects(). + // We just set it for later removal (also happening in player::process_effects(), so no side effects) with a duration of 0 turns. + get_effect( effect_alarm_clock ).set_duration( 0_turns ); recalc_sight_limits(); } diff --git a/src/player.h b/src/player.h index 0d5d5688e2fed..66e3b573d7798 100644 --- a/src/player.h +++ b/src/player.h @@ -1996,6 +1996,15 @@ class player : public Character // TODO: move these to avatar map_memory player_map_memory; bool show_map_memory; + + // magic mod + + // list of spells known by player + std::map spellbook; + // the base mana a player would start with + int mana_base; + // current mana + int mana; }; #endif diff --git a/src/recipe.cpp b/src/recipe.cpp index e6ec87986e7e8..ee0dda7ae1854 100644 --- a/src/recipe.cpp +++ b/src/recipe.cpp @@ -90,7 +90,11 @@ void recipe::load( JsonObject &jo, const std::string &src ) assign( jo, "obsolete", obsolete ); } - assign( jo, "time", time, strict, 0 ); + if( jo.has_int( "time" ) ) { + time = jo.get_int( "time" ); + } else if( jo.has_string( "time" ) ) { + time = to_moves( time_duration::read_from_json_string( *jo.get_raw( "time" ) ) ); + } assign( jo, "difficulty", difficulty, strict, 0, MAX_SKILL ); assign( jo, "flags", flags ); diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index cd69da5a21f18..ff6bc45e4a53f 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -37,6 +37,7 @@ #include "item.h" #include "item_factory.h" #include "json.h" +#include "magic.h" #include "mission.h" #include "monster.h" #include "morale.h" @@ -838,6 +839,7 @@ void avatar::store( JsonOut &json ) const json.member( "stamina", stamina ); json.member( "move_mode", move_mode ); + json.member( "magic", magic ); // crafting etc json.member( "activity", activity ); @@ -932,6 +934,7 @@ void avatar::load( JsonObject &data ) data.read( "keep_hands_free", keep_hands_free ); data.read( "stamina", stamina ); + data.read( "magic", magic ); data.read( "move_mode", move_mode ); set_highest_cat_level(); diff --git a/src/veh_interact.cpp b/src/veh_interact.cpp index ea0703c2e3808..8a3b19b50cd6c 100644 --- a/src/veh_interact.cpp +++ b/src/veh_interact.cpp @@ -825,6 +825,7 @@ bool veh_interact::do_install( std::string &msg ) part.has_flag( "SEAT" ) || part.has_flag( "BED" ) || part.has_flag( "SPACE_HEATER" ) || + part.has_flag( "COOLER" ) || part.has_flag( "DOOR_MOTOR" ) || part.has_flag( "WATER_PURIFIER" ) || part.has_flag( "WORKBENCH" ); diff --git a/src/veh_type.cpp b/src/veh_type.cpp index 47cfd355e7b29..5af188f5b156c 100644 --- a/src/veh_type.cpp +++ b/src/veh_type.cpp @@ -91,6 +91,7 @@ static const std::unordered_map vpart_bitflag_map = { "SOLAR_PANEL", VPFLAG_SOLAR_PANEL }, { "WIND_TURBINE", VPFLAG_WIND_TURBINE }, { "SPACE_HEATER", VPFLAG_SPACE_HEATER, }, + { "COOLER", VPFLAG_COOLER, }, { "WATER_WHEEL", VPFLAG_WATER_WHEEL }, { "RECHARGE", VPFLAG_RECHARGE }, { "VISION", VPFLAG_EXTENDS_VISION }, diff --git a/src/veh_type.h b/src/veh_type.h index 465d26a568df8..493e261eccc71 100644 --- a/src/veh_type.h +++ b/src/veh_type.h @@ -46,6 +46,7 @@ enum vpart_bitflags : int { VPFLAG_OPENABLE, VPFLAG_SEATBELT, VPFLAG_SPACE_HEATER, + VPFLAG_COOLER, VPFLAG_WHEEL, VPFLAG_MOUNTABLE, VPFLAG_FLOATS, diff --git a/src/vehicle.cpp b/src/vehicle.cpp index d91139e27b06d..aee455aab326d 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1291,6 +1291,7 @@ int vehicle::install_part( const point &dp, const vehicle_part &new_part ) "PLANTER", "SCOOP", "SPACE_HEATER", + "COOLER", "WATER_PURIFIER", "ROCKWHEEL" } @@ -4637,6 +4638,7 @@ void vehicle::refresh() water_wheels.clear(); funnels.clear(); heaters.clear(); + coolers.clear(); relative_parts.clear(); loose_parts.clear(); wheelcache.clear(); @@ -4725,6 +4727,9 @@ void vehicle::refresh() if( vpi.has_flag( "SPACE_HEATER" ) ) { heaters.push_back( p ); } + if( vpi.has_flag( "COOLER" ) ) { + coolers.push_back( p ); + } if( vpi.has_flag( VPFLAG_WHEEL ) ) { wheelcache.push_back( p ); } @@ -5489,7 +5494,7 @@ void vehicle::update_time( const time_point &update_to ) // Weather stuff, only for z-levels >= 0 // TODO: Have it wash cars from blood? if( funnels.empty() && solar_panels.empty() && wind_turbines.empty() && water_wheels.empty() && - heaters.empty() ) { + heaters.empty() && coolers.empty() ) { return; } // heaters emitting hot air @@ -5502,6 +5507,16 @@ void vehicle::update_time( const time_point &update_to ) g->m.adjust_field_strength( global_part_pos3( pt ), fd_hot_air3, density ); discharge_battery( pt.info().epower ); } + // coolers emitting cold air + for( int idx : coolers ) { + const vehicle_part &pt = parts[idx]; + if( pt.is_unavailable() || ( !pt.enabled ) ) { + continue; + } + int density = abs( pt.info().epower ) * 5; + g->m.adjust_field_strength( global_part_pos3( pt ), fd_cold_air3, density ); + discharge_battery( pt.info().epower ); + } // Get one weather data set per vehicle, they don't differ much across vehicle area auto accum_weather = sum_conditions( update_from, update_to, g->m.getabs( global_pos3() ) ); // make some reference objects to use to check for reload diff --git a/src/vehicle.h b/src/vehicle.h index 56b4750b05175..8c86693852337 100644 --- a/src/vehicle.h +++ b/src/vehicle.h @@ -1521,6 +1521,7 @@ class vehicle std::vector sails; // List of sail indices std::vector funnels; // List of funnel indices std::vector heaters; // List of heater parts + std::vector coolers; // List of cooler parts std::vector loose_parts; // List of UNMOUNT_ON_MOVE parts std::vector wheelcache; // List of wheels std::vector rail_wheelcache; // List of rail wheels diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp index d1ee2ed8e2566..0069d3aa0a191 100644 --- a/src/vehicle_use.cpp +++ b/src/vehicle_use.cpp @@ -227,6 +227,7 @@ void vehicle::set_electronics_menu_options( std::vector &options, add_toggle( _( "fridge" ), keybind( "TOGGLE_FRIDGE" ), "FRIDGE" ); add_toggle( _( "freezer" ), keybind( "TOGGLE_FREEZER" ), "FREEZER" ); add_toggle( _( "space heater" ), keybind( "TOGGLE_SPACE_HEATER" ), "SPACE_HEATER" ); + add_toggle( _( "cooler" ), keybind( "TOGGLE_COOLER" ), "COOLER" ); add_toggle( _( "recharger" ), keybind( "TOGGLE_RECHARGER" ), "RECHARGE" ); add_toggle( _( "plow" ), keybind( "TOGGLE_PLOW" ), "PLOW" ); add_toggle( _( "reaper" ), keybind( "TOGGLE_REAPER" ), "REAPER" ); diff --git a/tools/json_tools/adjust_values.py b/tools/json_tools/adjust_values.py new file mode 100755 index 0000000000000..e3b956a3fde13 --- /dev/null +++ b/tools/json_tools/adjust_values.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python3 + +import argparse +import json +import os + +args = argparse.ArgumentParser() +args.add_argument("dir", action="store", help="specify json directory") +args.add_argument("key", action="store", help="specify key") +args.add_argument("factor", type=int, action="store", help="specify factor") +args_dict = vars(args.parse_args()) + + +def gen_new(path): + with open(path, "r") as json_file: + json_data = json.load(json_file) + for jo in json_data: + if args_dict["key"] in jo: + val = jo[args_dict["key"]] // args_dict["factor"] + jo[args_dict["key"]] = f"{val} m" + return json_data + + +for root, directories, filenames in os.walk(args_dict["dir"]): + for filename in filenames: + path = os.path.join(root, filename) + if path.endswith(".json"): + new = gen_new(path) + with open(path, "w") as jf: + json.dump(new, jf) + os.system(f"../format/json_formatter.cgi {path}")