diff --git a/xml_converter/integration_tests/make_test.sh b/xml_converter/integration_tests/make_test.sh index 65ad638d..f2319de0 100755 --- a/xml_converter/integration_tests/make_test.sh +++ b/xml_converter/integration_tests/make_test.sh @@ -40,6 +40,6 @@ mkdir -p test_cases/$1/input/pack # Output folders and blank output files mkdir -p test_cases/$1/output_proto -touch test_cases/$1/output_proto/markers.bin +touch test_cases/$1/output_proto/markers.guildpoint mkdir -p test_cases/$1/output_xml touch test_cases/$1/output_xml/xml_file.xml diff --git a/xml_converter/integration_tests/test_cases/proto_constant_size_on_map/input/pack/markers.bin b/xml_converter/integration_tests/test_cases/proto_constant_size_on_map/input/pack/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_constant_size_on_map/input/pack/markers.bin rename to xml_converter/integration_tests/test_cases/proto_constant_size_on_map/input/pack/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_constant_size_on_map/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_constant_size_on_map/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_constant_size_on_map/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/proto_constant_size_on_map/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.bin b/xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.bin rename to xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/input/pack/markers.bin b/xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/input/pack/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/input/pack/markers.bin rename to xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/input/pack/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/proto_is_hidden_ingame/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin b/xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin rename to xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/input/pack/markers.bin b/xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/input/pack/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/input/pack/markers.bin rename to xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/input/pack/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/proto_is_hidden_on_minimap/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.bin b/xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.bin rename to xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_achievement_bit_index_valid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_achievement_bit_index_valid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_achievement_bit_index_valid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_achievement_bit_index_valid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_achievement_id/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_achievement_id/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_achievement_id/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_achievement_id/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_animation_speed/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_animation_speed/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_animation_speed/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_animation_speed/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_canfade_invalid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_canfade_invalid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_canfade_invalid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_canfade_invalid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_canfade_valid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_canfade_valid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_canfade_valid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_canfade_valid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_category_name_invalid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_name_invalid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_category_name_invalid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_category_name_invalid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_cull_chirality/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_cull_chirality/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_cull_chirality/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_cull_chirality/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_display_name_valid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_display_name_valid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_display_name_valid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_display_name_valid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_fade_distance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_fade_distance/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_fade_distance/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_fade_distance/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_festival_filter/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_festival_filter/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_festival_filter/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_festival_filter/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_is_wall/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_is_wall/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_is_wall/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_is_wall/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_map_id/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_map_id/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_map_id/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_map_id/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_map_type_filter/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_map_type_filter/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_map_type_filter/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_map_type_filter/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_mount_filter_invalid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_mount_filter_invalid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_mount_filter_invalid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_mount_filter_invalid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_mountfilter_valid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_mountfilter_valid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_mountfilter_valid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_mountfilter_valid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_profession_filter/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_profession_filter/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_profession_filter/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_profession_filter/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_render_ingame/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_render_ingame/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_render_ingame/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_render_ingame/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_render_on_minimap/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_render_on_minimap/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_render_on_minimap/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_render_on_minimap/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_scale_on_map_with_zoom/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_scale_on_map_with_zoom/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_scale_on_map_with_zoom/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_scale_on_map_with_zoom/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_specialization_filter/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_specialization_filter/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_specialization_filter/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_specialization_filter/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_species_filter/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_species_filter/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_species_filter/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_species_filter/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_texture/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_texture/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_texture/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_texture/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_texture_invalid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_texture_invalid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_texture_invalid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_texture_invalid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_trail_data/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_trail_data/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_trail_data/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_trail_data/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_type_invalid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_type_invalid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_type_invalid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_type_invalid/output_proto/markers.guildpoint diff --git a/xml_converter/integration_tests/test_cases/xml_type_valid/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_type_valid/output_proto/markers.guildpoint similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_type_valid/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_type_valid/output_proto/markers.guildpoint diff --git a/xml_converter/src/packaging_protobin.cpp b/xml_converter/src/packaging_protobin.cpp index 2b2f0911..f4b636f5 100644 --- a/xml_converter/src/packaging_protobin.cpp +++ b/xml_converter/src/packaging_protobin.cpp @@ -233,7 +233,7 @@ void write_protobuf_file( } _write_protobuf_file( - join_file_paths(state.marker_pack_root_directory, "markers.bin"), + join_file_paths(state.marker_pack_root_directory, "markers.guildpoint"), category_filter, marker_categories, category_to_pois, @@ -266,7 +266,7 @@ void write_protobuf_file_per_map_id( } for (auto iterator = mapid_to_category_to_pois.begin(); iterator != mapid_to_category_to_pois.end(); iterator++) { - string output_filepath = join_file_paths(state.marker_pack_root_directory, to_string(iterator->first) + ".bin"); + string output_filepath = join_file_paths(state.marker_pack_root_directory, to_string(iterator->first) + ".guildpoint"); _write_protobuf_file( output_filepath, diff --git a/xml_converter/src/xml_converter.cpp b/xml_converter/src/xml_converter.cpp index 4dbeb2cc..1d498970 100644 --- a/xml_converter/src/xml_converter.cpp +++ b/xml_converter/src/xml_converter.cpp @@ -88,7 +88,7 @@ void read_burrito_directory( cout << "Error: " << input_path << " is not an existing directory or file" << endl; } else if (filesystem::is_directory(input_path)) { - vector burrito_files = get_files_by_suffix(input_path, ".bin"); + vector burrito_files = get_files_by_suffix(input_path, ".guildpoint"); for (const string& path : burrito_files) { read_protobuf_file(path, input_path, marker_categories, parsed_pois); }