@@ -386,6 +386,10 @@ void Item_factory::finalize_pre( itype &obj )
386
386
obj.category_force = calc_category ( obj );
387
387
}
388
388
389
+ // use pre-Cataclysm price as default if post-cataclysm price unspecified
390
+ if ( obj.price_post < 0_cent ) {
391
+ obj.price_post = obj.price ;
392
+ }
389
393
// use base volume if integral volume unspecified
390
394
if ( obj.integral_volume < 0_ml ) {
391
395
obj.integral_volume = obj.volume ;
@@ -4069,7 +4073,7 @@ void itype::load( const JsonObject &jo, std::string_view src )
4069
4073
optional ( jo, was_loaded, " volume" , volume );
4070
4074
optional ( jo, was_loaded, " longest_side" , longest_side, -1_mm );
4071
4075
optional ( jo, was_loaded, " price" , price, not_negative_money, 0_cent );
4072
- optional ( jo, was_loaded, " price_postapoc" , price_post, not_negative_money, 0_cent );
4076
+ optional ( jo, was_loaded, " price_postapoc" , price_post, not_negative_money, -1_cent );
4073
4077
optional ( jo, was_loaded, " stackable" , stackable_ );
4074
4078
optional ( jo, was_loaded, " integral_volume" , integral_volume, not_negative_volume, -1_ml );
4075
4079
optional ( jo, was_loaded, " integral_longest_side" , integral_longest_side, not_negative_length,
0 commit comments