Merge pull request #1869 from Lizzie841/patch-98

support loading from tradegoods.txt aswell

src/gamestate/system_state.cpp

@@ -1906,14 +1906,18 @@ void state::load_scenario_data(parsers::error_handler& err, sys::year_month_day
 			assert(money_id.index() == 0);
 		}
 		auto goods = open_file(common, NATIVE("goods.txt"));
+		err.file_name = "goods.txt";
+		if(!goods) {
+			goods = open_file(common, NATIVE("tradegoods"));
+			err.file_name = "tradegoods.txt";
+		}
 		if(goods) {
 			auto content = view_contents(*goods);
-			err.file_name = "goods.txt";
 			parsers::token_generator gen(content.data, content.data + content.file_size);
 			parsers::parse_goods_file(gen, err, context);
 		} else {
 			err.fatal = true;
-			err.accumulated_errors += "File common/goods.txt could not be opened\n";
+			err.accumulated_errors += "File common/goods.txt nor common/tradegoods.txt could be opened\n";
 		}
 	}
 	// read buildings.text