diff --git a/data/json/construction.json b/data/json/construction.json index 0516cceacd6b1..a6bc62668bbc1 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -2148,7 +2148,8 @@ "time": "1 m", "components": [ [ [ "w_table", 1 ] ] ], "pre_special": "check_empty", - "post_terrain": "f_table" + "post_terrain": "f_table", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -2185,7 +2186,8 @@ "components": [ [ [ "workbench", 1 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", - "post_terrain": "f_workbench" + "post_terrain": "f_workbench", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -2282,7 +2284,8 @@ "components": [ [ [ "hammock", 1 ] ] ], "pre_note": "Can be deconstructed without tools. Must be supported on at least two sides.", "pre_special": "check_support", - "post_terrain": "f_hammock" + "post_terrain": "f_hammock", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -2294,7 +2297,8 @@ "components": [ [ [ "hammock_net", 1 ] ] ], "pre_note": "Can be deconstructed without tools. Must be supported on at least two sides.", "pre_special": "check_support", - "post_terrain": "f_hammock_net" + "post_terrain": "f_hammock_net", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -2456,7 +2460,8 @@ "components": [ [ [ "anvil", 1 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", - "post_terrain": "f_anvil" + "post_terrain": "f_anvil", + "activity_level": "MODERATE_EXERCISE" }, { "type": "construction", @@ -2468,7 +2473,8 @@ "components": [ [ [ "char_forge", 1 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", - "post_terrain": "f_forge" + "post_terrain": "f_forge", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -2480,7 +2486,8 @@ "components": [ [ [ "still", 1 ] ] ], "pre_note": "Can be deconstructed without tools.", "pre_special": "check_empty", - "post_terrain": "f_still" + "post_terrain": "f_still", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -2531,7 +2538,8 @@ "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" + "post_terrain": "f_hay", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3106,7 +3114,8 @@ "components": [ [ [ "2x4", 12 ], [ "log", 12 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ], "pre_special": "check_up_OK", "pre_terrain": "t_rock", - "post_special": "done_mine_upstair" + "post_special": "done_mine_upstair", + "activity_level": "EXTRA_EXERCISE" }, { "type": "construction", @@ -3174,7 +3183,8 @@ "time": "5 m", "components": [ [ [ "fridge", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3185,7 +3195,8 @@ "time": "5 m", "components": [ [ [ "minifridge", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3196,7 +3207,8 @@ "time": "5 m", "components": [ [ [ "freezer", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3207,7 +3219,8 @@ "time": "5 m", "components": [ [ [ "minifreezer", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3218,7 +3231,8 @@ "time": "5 m", "components": [ [ [ "oven", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3229,7 +3243,8 @@ "time": "5 m", "components": [ [ [ "stationary_water_purifier", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3240,7 +3255,8 @@ "time": "5 m", "components": [ [ [ "arcade_machine", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3251,7 +3267,8 @@ "time": "5 m", "components": [ [ [ "forge", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3262,7 +3279,8 @@ "time": "5 m", "components": [ [ [ "kiln", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3273,7 +3291,8 @@ "time": "5 m", "components": [ [ [ "drill_press", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3284,7 +3303,8 @@ "time": "5 m", "components": [ [ [ "tablesaw", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3295,7 +3315,8 @@ "time": "5 m", "components": [ [ [ "mitresaw", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3306,7 +3327,8 @@ "time": "5 m", "components": [ [ [ "bandsaw", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3317,7 +3339,8 @@ "time": "5 m", "components": [ [ [ "router", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3328,7 +3351,8 @@ "time": "5 m", "components": [ [ [ "planer", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3339,7 +3363,8 @@ "time": "5 m", "components": [ [ [ "jointer", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3350,7 +3375,8 @@ "time": "5 m", "components": [ [ [ "hydraulic_press", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3361,7 +3387,8 @@ "time": "5 m", "components": [ [ [ "air_compressor", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3373,7 +3400,8 @@ "qualities": [ [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "solar_panel", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3385,7 +3413,8 @@ "qualities": [ [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "reinforced_solar_panel", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3397,7 +3426,8 @@ "qualities": [ [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "solar_panel_v2", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3409,7 +3439,8 @@ "qualities": [ [ { "id": "WRENCH", "level": 1 } ] ], "components": [ [ [ "reinforced_solar_panel_v2", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3420,7 +3451,8 @@ "time": "5 m", "components": [ [ [ "large_space_heater", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3431,7 +3463,8 @@ "time": "5 m", "components": [ [ [ "small_space_heater", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3442,7 +3475,8 @@ "time": "6 m", "components": [ [ [ "small_storage_battery", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3453,7 +3487,8 @@ "time": "6 m", "components": [ [ [ "medium_storage_battery", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3464,7 +3499,8 @@ "time": "6 m", "components": [ [ [ "storage_battery", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3475,7 +3511,8 @@ "time": "6 m", "components": [ [ [ "large_storage_battery", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3486,7 +3523,8 @@ "time": "6 m", "components": [ [ [ "battery_car", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3497,7 +3535,8 @@ "time": "6 m", "components": [ [ [ "household_washing_machine", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3508,7 +3547,8 @@ "time": "6 m", "components": [ [ [ "household_dishwasher", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "BRISK_EXERCISE" }, { "type": "construction", @@ -3519,7 +3559,8 @@ "time": "6 m", "components": [ [ [ "autoclave", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "MODERATE_EXERCISE" }, { "type": "construction", @@ -3530,7 +3571,8 @@ "time": "5 s", "components": [ [ [ "standing_lamp", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "NO_EXERCISE" }, { "type": "construction", @@ -3541,7 +3583,8 @@ "time": "5 s", "components": [ [ [ "standing_floodlight", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "NO_EXERCISE" }, { "type": "construction", @@ -3552,7 +3595,8 @@ "time": "4 m", "components": [ [ [ "foot_locker_recharge_station", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "MODERATE_EXERCISE" }, { "type": "construction", @@ -3563,7 +3607,8 @@ "time": "2 m", "components": [ [ [ "box_battery_charger", 1 ] ] ], "pre_special": "check_empty", - "post_special": "done_appliance" + "post_special": "done_appliance", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3576,7 +3621,8 @@ "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ] ], "pre_flags": "WIRED_WALL", "pre_special": "check_no_wiring", - "post_special": "done_wiring" + "post_special": "done_wiring", + "activity_level": "LIGHT_EXERCISE" }, { "type": "construction", @@ -3880,7 +3926,8 @@ "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "clay_lump", "count": [ 6, 12 ] } ], "pre_terrain": "t_clay", - "post_special": "done_extract_maybe_revert_to_dirt" + "post_special": "done_extract_maybe_revert_to_dirt", + "activity_level": "EXTRA_EXERCISE" }, { "type": "construction", @@ -3893,7 +3940,8 @@ "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "byproducts": [ { "item": "clay_lump", "count": [ 6, 12 ] } ], "pre_terrain": "t_claymound", - "post_special": "done_extract_maybe_revert_to_dirt" + "post_special": "done_extract_maybe_revert_to_dirt", + "activity_level": "EXTRA_EXERCISE" }, { "type": "construction", @@ -4035,7 +4083,8 @@ "pre_special": "check_no_trap", "post_special": "done_mark_firewood", "dark_craftable": true, - "post_flags": [ "keep_items" ] + "post_flags": [ "keep_items" ], + "activity_level": "NO_EXERCISE" }, { "type": "construction", @@ -4048,7 +4097,8 @@ "pre_special": "check_no_trap", "post_special": "done_mark_practice_target", "dark_craftable": true, - "post_flags": [ "keep_items" ] + "post_flags": [ "keep_items" ], + "activity_level": "NO_EXERCISE" }, { "type": "construction", diff --git a/src/construction.cpp b/src/construction.cpp index abc43d0d531e0..f37f396359936 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -1893,7 +1893,7 @@ void load_construction( const JsonObject &jo ) } con.activity_level = - activity_levels_map.find( jo.get_string( "activity_level", "NO_EXERCISE" ) )->second; + activity_levels_map.find( jo.get_string( "activity_level", "MODERATE_EXERCISE" ) )->second; if( jo.has_member( "pre_flags" ) ) { con.pre_flags.clear(); diff --git a/src/construction.h b/src/construction.h index 099fac7fec7a4..427b6b667119a 100644 --- a/src/construction.h +++ b/src/construction.h @@ -105,7 +105,7 @@ struct construction { //can be build in the dark bool dark_craftable = false; - float activity_level = NO_EXERCISE; + float activity_level = MODERATE_EXERCISE; private: std::string get_time_string() const; };