diff --git a/data/json/items/comestibles/raw_grain.json b/data/json/items/comestibles/raw_grain.json index c4b4fd38eb4f6..fd702b463c996 100644 --- a/data/json/items/comestibles/raw_grain.json +++ b/data/json/items/comestibles/raw_grain.json @@ -3,7 +3,7 @@ "type": "COMESTIBLE", "id": "corn", "name": { "str": "corn cob" }, - "weight": "690 g", + "weight": "140 g", "color": "light_green", "spoils_in": "5 days", "comestible_type": "FOOD", @@ -14,7 +14,7 @@ "//": "Thinking this is a single ear here.", "price_postapoc": 50, "material": [ "veggy" ], - "volume": "750 ml", + "volume": "195 ml", "flags": [ "EATEN_HOT", "RAW" ], "vitamins": [ [ "vitC", 12 ], [ "iron", 4 ] ], "use_action": { "type": "consume_drug", "used_up_item": "empty_corn_cob", "moves": 500 } @@ -23,7 +23,7 @@ "type": "COMESTIBLE", "id": "corn_kernels", "name": { "str_sp": "corn kernels" }, - "weight": "210 g", + "weight": "60 g", "color": "yellow", "spoils_in": "5 days", "comestible_type": "FOOD", @@ -33,7 +33,7 @@ "price": 200, "price_postapoc": 60, "material": [ "veggy" ], - "volume": "285 ml", + "volume": "83 ml", "smoking_result": "dry_corn", "vitamins": [ [ "vitC", 12 ], [ "iron", 4 ] ], "petfood": [ "CATTLEFOOD" ], @@ -44,7 +44,7 @@ "type": "COMESTIBLE", "id": "empty_corn_cob", "name": { "str": "empty corn cob" }, - "weight": "480 g", + "weight": "80 g", "color": "yellow", "spoils_in": "5 days", "comestible_type": "FOOD", @@ -53,7 +53,7 @@ "price": 1, "price_postapoc": 1, "material": [ "veggy", "wood" ], - "volume": "465 ml", + "volume": "111 ml", "fun": -8, "flags": [ "RAW" ] }, @@ -61,7 +61,7 @@ "type": "COMESTIBLE", "id": "popcorn_raw", "name": { "str_sp": "raw popcorn" }, - "weight": "153 g", + "weight": "140 g", "color": "light_green", "spoils_in": "5 days", "comestible_type": "FOOD", @@ -70,7 +70,7 @@ "description": "A special variety of corn which could be used for making popcorn, after it's dried. Unlike normal corn, it's not sweet and is more dry.", "price": 170, "material": [ "veggy" ], - "volume": "750 ml", + "volume": "195 ml", "fun": -2, "vitamins": [ [ "vitC", 12 ], [ "iron", 4 ] ], "smoking_result": "kernels", @@ -82,7 +82,7 @@ "type": "COMESTIBLE", "id": "kernels", "name": { "str_sp": "popcorn kernels" }, - "weight": "32 g", + "weight": "45 g", "color": "brown", "container": "bag_plastic", "comestible_type": "FOOD", @@ -92,7 +92,7 @@ "price": 100, "price_postapoc": 400, "material": [ "junk" ], - "volume": "250 ml", + "volume": "83 ml", "fun": -6, "petfood": [ "CATTLEFOOD", "BIRDFOOD" ], "flags": [ "NUTRIENT_OVERRIDE", "EDIBLE_FROZEN", "PLANTABLE_SEED", "INEDIBLE", "CATTLE", "BIRD", "RAT", "MOUSE" ], @@ -102,7 +102,7 @@ "type": "COMESTIBLE", "id": "popcorn", "name": { "str_sp": "popcorn" }, - "weight": "8 g", + "weight": "11 g", "color": "white", "spoils_in": "360 days", "container": "bag_plastic", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 38838eb4e29fa..05968b5cc255a 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -282,7 +282,7 @@ "id": "corn_on_cob", "name": { "str_sp": "corn on the cob" }, "comestible_type": "FOOD", - "weight": "178 g", + "weight": "130 g", "color": "yellow", "symbol": "%", "material": [ "veggy" ], @@ -290,7 +290,7 @@ "spoils_in": "2 days", "quench": -2, "calories": 370, - "volume": "250 ml", + "volume": "195 ml", "description": "An ear of corn cooked in foil.", "price": 50, "price_postapoc": 100, @@ -337,7 +337,7 @@ "type": "COMESTIBLE", "id": "cornmeal", "name": { "str_sp": "cornmeal" }, - "weight": "60 g", + "weight": "12500 mg", "color": "yellow", "spoils_in": "360 days", "container": "box_small", @@ -350,7 +350,7 @@ "price": "45 cent", "price_postapoc": "2 cent", "material": [ "veggy", "powder" ], - "volume": "107 ml", + "volume": "24 ml", "flags": [ "EDIBLE_FROZEN" ], "fun": -5 }, @@ -1116,7 +1116,7 @@ "type": "COMESTIBLE", "id": "dry_corn", "name": { "str_sp": "dehydrated corn kernels" }, - "weight": "180 g", + "weight": "45 g", "color": "yellow", "comestible_type": "FOOD", "symbol": "%", @@ -1127,7 +1127,7 @@ "price_postapoc": 50, "material": [ "veggy" ], "milling": { "into": "cornmeal", "recipe": "cornmeal_mill_1_3" }, - "volume": "255 ml", + "volume": "83 ml", "vitamins": [ [ "vitC", 12 ], [ "iron", 4 ] ], "petfood": [ "CATTLEFOOD" ], "flags": [ "EDIBLE_FROZEN", "RAW", "INEDIBLE", "CATTLE", "PLANTABLE_SEED" ], @@ -1233,14 +1233,14 @@ "id": "rehydrated_corn_kernels", "name": { "str_sp": "rehydrated corn kernels" }, "copy-from": "veggy", - "weight": "70 g", + "weight": "60 g", "color": "yellow", "spoils_in": "1 day", "description": "Reconstituted corn kernels, much more enjoyable to eat now that they have been rehydrated.", "price": 900, "price_postapoc": 50, "smoking_result": "dry_corn", - "volume": "95 ml", + "volume": "83 ml", "delete": { "flags": [ "RAW" ] }, "vitamins": [ [ "vitC", 12 ], [ "iron", 4 ] ], "fun": 2 diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index b6ced79c0e14f..cac8aef49695f 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -343,7 +343,6 @@ "confit_meat", "xl_k_gambeson_vest_loose", "chem_phenol", - "empty_corn_cob", "combination_gun_shotgun", "mask_dust", "small_relic", diff --git a/src/input.h b/src/input.h index 19693eef03724..b6810ee2b4206 100644 --- a/src/input.h +++ b/src/input.h @@ -271,7 +271,7 @@ class input_manager void wait_for_any_key(); /** - * Sets global input polling timeout as appropriate for the current interface system. + * Sets global input polling timeout in milliseconds as appropriate for the current interface system. * Use `input_context::(re)set_timeout()` when possible so timeout will be properly * reset when entering a new input context. */ diff --git a/src/input_context.h b/src/input_context.h index 043560b0400d4..1d374ebd8e88a 100644 --- a/src/input_context.h +++ b/src/input_context.h @@ -267,6 +267,7 @@ class input_context * * If the action is mouse input, returns "MOUSE". * + * @param timeout in milliseconds. * @return One of the input actions formerly registered with * `register_action()`, or "ERROR" if an error happened. * diff --git a/src/main_menu.cpp b/src/main_menu.cpp index 7645cd5be1bb7..013f6e26b3d57 100644 --- a/src/main_menu.cpp +++ b/src/main_menu.cpp @@ -108,7 +108,7 @@ void demo_ui::run() while( is_open ) { ui_manager::redraw(); - action = ctxt.handle_input(); + action = ctxt.handle_input( 5 ); if( action == "QUIT" ) { break; }