Standardize JSON times to strings (#37396)

Integer times in construction.json were converted directly to minutes (confirmed in-game that these are the correct construction times). Integer times in some ammo and vehicle recipes were converted such that 100 is 1 turn, and since 1 turn is 1 second, this means "time: 4000" is a duration of 40 seconds, and "time: 30000" is a duration of 5 minutes. Again I checked in-game for these recipes to be sure of my interpretation (despite a few of these seeming unrealistically quick, such as the 5-second boat oars). Partial fix for #36110
CleverRaven · Jan 26, 2020 · 88cbf39 · 88cbf39
1 parent 8c1d65e
commit 88cbf39
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -854,7 +854,7 @@
     "//": "Fills a deep pit with dirt.",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": 40,
+    "time": "40 m",
     "qualities": [ [ { "id": "DIG", "level": 1 } ] ],
     "components": [ [ [ "material_soil", 200 ] ] ],
     "pre_special": "check_empty",
@@ -867,7 +867,7 @@
     "//": "Adds wood chippings to a shallow pit to prevent plants growing, or for looks.",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": 40,
+    "time": "40 m",
     "components": [ [ [ "splinter", 50 ] ] ],
     "pre_terrain": "t_pit_shallow",
     "post_terrain": "t_woodchips"
@@ -910,7 +910,7 @@
     "//": "Makes an outside wooden paving, similar to what would be used in patios.",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 1 ] ],
-    "time": 100,
+    "time": "100 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 14 ] ], [ [ "nail", 28 ] ] ],
     "pre_special": "check_empty",
@@ -1735,7 +1735,7 @@
     "description": "Build Bed Frame",
     "category": "FURN",
     "required_skills": [ [ "fabrication", 4 ] ],
-    "time": 55,
+    "time": "55 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
     "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ] ],
     "pre_special": "check_empty",
@@ -1746,7 +1746,7 @@
     "description": "Add Mattress to Bed Frame",
     "category": "FURN",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": 5,
+    "time": "5 m",
     "components": [ [ [ "mattress", 1 ], [ "down_mattress", 1 ] ] ],
     "pre_terrain": "f_bed_frame",
     "post_terrain": "f_bed"
@@ -2983,7 +2983,7 @@
     "description": "Hang Hanging Meathook",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 1 ] ],
-    "time": 15,
+    "time": "15 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ],
     "components": [ [ [ "grip_hook", 1 ] ], [ [ "chain", 1 ] ] ],
     "pre_special": "check_support",
@@ -3050,7 +3050,7 @@
     "//": "Step 1: start wall",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
-    "time": 120,
+    "time": "120 m",
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [
       [ [ "adobe_brick", 10 ] ],
@@ -3067,7 +3067,7 @@
     "//": "Step 2: finish wall",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
-    "time": 120,
+    "time": "120 m",
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [
       [ [ "adobe_brick", 10 ] ],

diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
@@ -381,7 +381,7 @@
     "skill_used": "fabrication",
     "difficulty": 5,
     "skills_required": [ "gun", 5 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
     "charges": 1,
@@ -402,7 +402,7 @@
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ "gun", 7 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
     "charges": 1,
@@ -422,7 +422,7 @@
     "skill_used": "fabrication",
     "difficulty": 4,
     "skills_required": [ "gun", 4 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
     "charges": 1,
@@ -442,7 +442,7 @@
     "skill_used": "fabrication",
     "difficulty": 4,
     "skills_required": [ "gun", 4 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
     "charges": 1,

diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json
@@ -107,7 +107,7 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "skills_required": [ "gun", 1 ],
-    "time": 3000,
+    "time": "30 s",
     "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ],
     "charges": 1,
     "reversible": true,
@@ -123,7 +123,7 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "skills_required": [ "gun", 1 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_shotgun", 1 ] ],
     "charges": 1,
@@ -140,7 +140,7 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "skills_required": [ "gun", 1 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
@@ -157,7 +157,7 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "skills_required": [ "gun", 1 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ],
     "charges": 1,
@@ -174,7 +174,7 @@
     "skill_used": "fabrication",
     "difficulty": 3,
     "skills_required": [ "gun", 1 ],
-    "time": 2000,
+    "time": "20 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
@@ -188,7 +188,7 @@
     "type": "recipe",
     "copy-from": "bp_shot_00",
     "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ],
-    "time": 4000,
+    "time": "40 s",
     "tools": [ [ [ "press_dowel", -1 ] ] ],
     "components": [ [ [ "chem_black_powder", 6 ] ] ]
   },
@@ -198,7 +198,7 @@
     "type": "recipe",
     "copy-from": "bp_shot_bird",
     "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ],
-    "time": 4000,
+    "time": "40 s",
     "tools": [ [ [ "press_dowel", -1 ] ] ],
     "components": [ [ [ "chem_black_powder", 3 ] ] ]
   },
@@ -208,7 +208,7 @@
     "type": "recipe",
     "copy-from": "bp_shot_dragon",
     "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ],
-    "time": 4000,
+    "time": "40 s",
     "tools": [ [ [ "press_dowel", -1 ] ] ],
     "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "magnesium", 5 ] ] ]
   },
@@ -218,7 +218,7 @@
     "type": "recipe",
     "copy-from": "bp_shot_slug",
     "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ],
-    "time": 4000,
+    "time": "40 s",
     "using": [ [ "ammo_bullet", 20 ], [ "ammo_shot", 1 ] ],
     "tools": [
       [ [ "press_dowel", -1 ] ],

diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
@@ -61,7 +61,7 @@
     "subcategory": "CSC_OTHER_VEHICLE",
     "skill_used": "fabrication",
     "difficulty": 3,
-    "time": 120000,
+    "time": "20 m",
     "book_learn": [ [ "textbook_fabrication", 5 ], [ "textbook_carpentry", 5 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "using": [ [ "sewing_standard", 100 ] ],
@@ -251,7 +251,7 @@
     "subcategory": "CSC_OTHER_PARTS",
     "skill_used": "mechanics",
     "difficulty": 5,
-    "time": 180000,
+    "time": "30 m",
     "reversible": true,
     "autolearn": false,
     "book_learn": [ [ "textbook_mechanics", 5 ], [ "manual_mechanics", 5 ], [ "textbook_fabrication", 5 ] ],
@@ -370,7 +370,7 @@
     "subcategory": "CSC_OTHER_VEHICLE",
     "skill_used": "fabrication",
     "difficulty": 3,
-    "time": 6000,
+    "time": "1 m",
     "reversible": true,
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
@@ -383,7 +383,7 @@
     "subcategory": "CSC_OTHER_VEHICLE",
     "skill_used": "fabrication",
     "difficulty": 4,
-    "time": 30000,
+    "time": "5 m",
     "autolearn": true,
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 50, "LIST" ] ] ],
     "components": [ [ [ "plastic_chunk", 50 ] ] ]
@@ -395,7 +395,7 @@
     "subcategory": "CSC_OTHER_VEHICLE",
     "skill_used": "fabrication",
     "difficulty": 2,
-    "time": 30000,
+    "time": "5 m",
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
     "using": [ [ "sewing_standard", 100 ] ],