diff --git a/guildpoint.gd b/guildpoint.gd index 83b08f8d..4fe2c082 100644 --- a/guildpoint.gd +++ b/guildpoint.gd @@ -929,21 +929,6 @@ class Icon: service.field = _map_id data[_map_id.tag] = service - _distance_fade_end = PBField.new("distance_fade_end", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 5, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _distance_fade_end - data[_distance_fade_end.tag] = service - - _distance_fade_start = PBField.new("distance_fade_start", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 6, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _distance_fade_start - data[_distance_fade_start.tag] = service - - _height_offset = PBField.new("height_offset", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 7, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _height_offset - data[_height_offset.tag] = service - _position = PBField.new("position", PB_DATA_TYPE.MESSAGE, PB_RULE.OPTIONAL, 8, true, DEFAULT_VALUES_3[PB_DATA_TYPE.MESSAGE]) service = PBServiceField.new() service.field = _position @@ -977,21 +962,6 @@ class Icon: service.field = _disable_player_cutout data[_disable_player_cutout.tag] = service - _minimum_size_on_screen = PBField.new("minimum_size_on_screen", PB_DATA_TYPE.INT32, PB_RULE.OPTIONAL, 20, true, DEFAULT_VALUES_3[PB_DATA_TYPE.INT32]) - service = PBServiceField.new() - service.field = _minimum_size_on_screen - data[_minimum_size_on_screen.tag] = service - - _map_display_size = PBField.new("map_display_size", PB_DATA_TYPE.INT32, PB_RULE.OPTIONAL, 21, true, DEFAULT_VALUES_3[PB_DATA_TYPE.INT32]) - service = PBServiceField.new() - service.field = _map_display_size - data[_map_display_size.tag] = service - - _maximum_size_on_screen = PBField.new("maximum_size_on_screen", PB_DATA_TYPE.INT32, PB_RULE.OPTIONAL, 22, true, DEFAULT_VALUES_3[PB_DATA_TYPE.INT32]) - service = PBServiceField.new() - service.field = _maximum_size_on_screen - data[_maximum_size_on_screen.tag] = service - _constant_size_on_map = PBField.new("constant_size_on_map", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 23, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]) service = PBServiceField.new() service.field = _constant_size_on_map @@ -1068,11 +1038,6 @@ class Icon: service.field = _is_hidden_on_minimap data[_is_hidden_on_minimap.tag] = service - _tentative__scale = PBField.new("tentative__scale", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 2048, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _tentative__scale - data[_tentative__scale.tag] = service - _bhdraft__schedule = PBField.new("bhdraft__schedule", PB_DATA_TYPE.STRING, PB_RULE.OPTIONAL, 2052, true, DEFAULT_VALUES_3[PB_DATA_TYPE.STRING]) service = PBServiceField.new() service.field = _bhdraft__schedule @@ -1112,33 +1077,6 @@ class Icon: func set_map_id(value : int) -> void: _map_id.value = value - var _distance_fade_end: PBField - func get_distance_fade_end() -> float: - return _distance_fade_end.value - func clear_distance_fade_end() -> void: - data[5].state = PB_SERVICE_STATE.UNFILLED - _distance_fade_end.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_distance_fade_end(value : float) -> void: - _distance_fade_end.value = value - - var _distance_fade_start: PBField - func get_distance_fade_start() -> float: - return _distance_fade_start.value - func clear_distance_fade_start() -> void: - data[6].state = PB_SERVICE_STATE.UNFILLED - _distance_fade_start.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_distance_fade_start(value : float) -> void: - _distance_fade_start.value = value - - var _height_offset: PBField - func get_height_offset() -> float: - return _height_offset.value - func clear_height_offset() -> void: - data[7].state = PB_SERVICE_STATE.UNFILLED - _height_offset.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_height_offset(value : float) -> void: - _height_offset.value = value - var _position: PBField func get_position() -> Position: return _position.value @@ -1196,33 +1134,6 @@ class Icon: func set_disable_player_cutout(value : bool) -> void: _disable_player_cutout.value = value - var _minimum_size_on_screen: PBField - func get_minimum_size_on_screen() -> int: - return _minimum_size_on_screen.value - func clear_minimum_size_on_screen() -> void: - data[20].state = PB_SERVICE_STATE.UNFILLED - _minimum_size_on_screen.value = DEFAULT_VALUES_3[PB_DATA_TYPE.INT32] - func set_minimum_size_on_screen(value : int) -> void: - _minimum_size_on_screen.value = value - - var _map_display_size: PBField - func get_map_display_size() -> int: - return _map_display_size.value - func clear_map_display_size() -> void: - data[21].state = PB_SERVICE_STATE.UNFILLED - _map_display_size.value = DEFAULT_VALUES_3[PB_DATA_TYPE.INT32] - func set_map_display_size(value : int) -> void: - _map_display_size.value = value - - var _maximum_size_on_screen: PBField - func get_maximum_size_on_screen() -> int: - return _maximum_size_on_screen.value - func clear_maximum_size_on_screen() -> void: - data[22].state = PB_SERVICE_STATE.UNFILLED - _maximum_size_on_screen.value = DEFAULT_VALUES_3[PB_DATA_TYPE.INT32] - func set_maximum_size_on_screen(value : int) -> void: - _maximum_size_on_screen.value = value - var _constant_size_on_map: PBField func get_constant_size_on_map() -> bool: return _constant_size_on_map.value @@ -1355,15 +1266,6 @@ class Icon: func set_is_hidden_on_minimap(value : bool) -> void: _is_hidden_on_minimap.value = value - var _tentative__scale: PBField - func get_tentative__scale() -> float: - return _tentative__scale.value - func clear_tentative__scale() -> void: - data[2048].state = PB_SERVICE_STATE.UNFILLED - _tentative__scale.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_tentative__scale(value : float) -> void: - _tentative__scale.value = value - var _bhdraft__schedule: PBField func get_bhdraft__schedule() -> String: return _bhdraft__schedule.value @@ -1422,27 +1324,12 @@ class Trail: service.field = _map_id data[_map_id.tag] = service - _distance_fade_end = PBField.new("distance_fade_end", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 5, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _distance_fade_end - data[_distance_fade_end.tag] = service - - _distance_fade_start = PBField.new("distance_fade_start", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 6, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _distance_fade_start - data[_distance_fade_start.tag] = service - _trail_data = PBField.new("trail_data", PB_DATA_TYPE.MESSAGE, PB_RULE.OPTIONAL, 7, true, DEFAULT_VALUES_3[PB_DATA_TYPE.MESSAGE]) service = PBServiceField.new() service.field = _trail_data service.func_ref = funcref(self, "new_trail_data") data[_trail_data.tag] = service - _animation_speed = PBField.new("animation_speed", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 8, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _animation_speed - data[_animation_speed.tag] = service - _achievement_id = PBField.new("achievement_id", PB_DATA_TYPE.INT32, PB_RULE.OPTIONAL, 16, true, DEFAULT_VALUES_3[PB_DATA_TYPE.INT32]) service = PBServiceField.new() service.field = _achievement_id @@ -1463,11 +1350,6 @@ class Trail: service.field = _is_wall data[_is_wall.tag] = service - _scale = PBField.new("scale", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 21, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _scale - data[_scale.tag] = service - _rgba_color = PBField.new("rgba_color", PB_DATA_TYPE.FIXED32, PB_RULE.OPTIONAL, 22, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FIXED32]) service = PBServiceField.new() service.field = _rgba_color @@ -1509,11 +1391,6 @@ class Trail: service.func_ref = funcref(self, "new_species_filter") data[_species_filter.tag] = service - _map_display_size = PBField.new("map_display_size", PB_DATA_TYPE.INT32, PB_RULE.OPTIONAL, 29, true, DEFAULT_VALUES_3[PB_DATA_TYPE.INT32]) - service = PBServiceField.new() - service.field = _map_display_size - data[_map_display_size.tag] = service - _cull_chirality = PBField.new("cull_chirality", PB_DATA_TYPE.ENUM, PB_RULE.OPTIONAL, 30, true, DEFAULT_VALUES_3[PB_DATA_TYPE.ENUM]) service = PBServiceField.new() service.field = _cull_chirality @@ -1573,24 +1450,6 @@ class Trail: func set_map_id(value : int) -> void: _map_id.value = value - var _distance_fade_end: PBField - func get_distance_fade_end() -> float: - return _distance_fade_end.value - func clear_distance_fade_end() -> void: - data[5].state = PB_SERVICE_STATE.UNFILLED - _distance_fade_end.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_distance_fade_end(value : float) -> void: - _distance_fade_end.value = value - - var _distance_fade_start: PBField - func get_distance_fade_start() -> float: - return _distance_fade_start.value - func clear_distance_fade_start() -> void: - data[6].state = PB_SERVICE_STATE.UNFILLED - _distance_fade_start.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_distance_fade_start(value : float) -> void: - _distance_fade_start.value = value - var _trail_data: PBField func get_trail_data() -> TrailData: return _trail_data.value @@ -1601,15 +1460,6 @@ class Trail: _trail_data.value = TrailData.new() return _trail_data.value - var _animation_speed: PBField - func get_animation_speed() -> float: - return _animation_speed.value - func clear_animation_speed() -> void: - data[8].state = PB_SERVICE_STATE.UNFILLED - _animation_speed.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_animation_speed(value : float) -> void: - _animation_speed.value = value - var _achievement_id: PBField func get_achievement_id() -> int: return _achievement_id.value @@ -1646,15 +1496,6 @@ class Trail: func set_is_wall(value : bool) -> void: _is_wall.value = value - var _scale: PBField - func get_scale() -> float: - return _scale.value - func clear_scale() -> void: - data[21].state = PB_SERVICE_STATE.UNFILLED - _scale.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_scale(value : float) -> void: - _scale.value = value - var _rgba_color: PBField func get_rgba_color() -> int: return _rgba_color.value @@ -1724,15 +1565,6 @@ class Trail: _species_filter.value = SpeciesFilter.new() return _species_filter.value - var _map_display_size: PBField - func get_map_display_size() -> int: - return _map_display_size.value - func clear_map_display_size() -> void: - data[29].state = PB_SERVICE_STATE.UNFILLED - _map_display_size.value = DEFAULT_VALUES_3[PB_DATA_TYPE.INT32] - func set_map_display_size(value : int) -> void: - _map_display_size.value = value - var _cull_chirality: PBField func get_cull_chirality(): return _cull_chirality.value @@ -2000,11 +1832,6 @@ class Trigger: service.field = _reset_length data[_reset_length.tag] = service - _range = PBField.new("range", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 11, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT]) - service = PBServiceField.new() - service.field = _range - data[_range.tag] = service - _action_hide_category = PBField.new("action_hide_category", PB_DATA_TYPE.MESSAGE, PB_RULE.OPTIONAL, 12, true, DEFAULT_VALUES_3[PB_DATA_TYPE.MESSAGE]) service = PBServiceField.new() service.field = _action_hide_category @@ -2120,15 +1947,6 @@ class Trigger: func set_reset_length(value : float) -> void: _reset_length.value = value - var _range: PBField - func get_range() -> float: - return _range.value - func clear_range() -> void: - data[11].state = PB_SERVICE_STATE.UNFILLED - _range.value = DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT] - func set_range(value : float) -> void: - _range.value = value - var _action_hide_category: PBField func get_action_hide_category() -> Category: return _action_hide_category.value diff --git a/xml_converter/doc/fade/distance_fade_end.md b/xml_converter/doc/fade/distance_fade_end.md index ca4508fb..d1ad9a99 100644 --- a/xml_converter/doc/fade/distance_fade_end.md +++ b/xml_converter/doc/fade/distance_fade_end.md @@ -3,7 +3,8 @@ name: Distance Fade End type: Float32 applies_to: [Icon, Trail] xml_fields: [FadeFar, DistanceFadeEnd] -protobuf_field: distance_fade_end +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #distance_fade_end examples: - "850" - "600" diff --git a/xml_converter/doc/fade/distance_fade_start.md b/xml_converter/doc/fade/distance_fade_start.md index 78a1bea5..56355435 100644 --- a/xml_converter/doc/fade/distance_fade_start.md +++ b/xml_converter/doc/fade/distance_fade_start.md @@ -3,7 +3,8 @@ name: Distance Fade Start type: Float32 applies_to: [Icon, Trail] xml_fields: [FadeNear, DistanceFadeStart] -protobuf_field: distance_fade_start +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #distance_fade_start examples: - "650" - "400" diff --git a/xml_converter/doc/position/height_offset.md b/xml_converter/doc/position/height_offset.md index b0f2823f..a7ea11e6 100644 --- a/xml_converter/doc/position/height_offset.md +++ b/xml_converter/doc/position/height_offset.md @@ -3,7 +3,8 @@ name: Height Offset type: Float32 applies_to: ["Icon"] xml_fields: ["HeightOffset", "BHHeightOffset"] -protobuf_field: height_offset +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #height_offset examples: - "0" --- diff --git a/xml_converter/doc/rendering/map_display_size.md b/xml_converter/doc/rendering/map_display_size.md index 5cd75677..4b3d62be 100644 --- a/xml_converter/doc/rendering/map_display_size.md +++ b/xml_converter/doc/rendering/map_display_size.md @@ -3,7 +3,8 @@ name: Map Display Size type: Int32 applies_to: [Icon, Trail] xml_fields: [MapDisplaySize] -protobuf_field: map_display_size +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #map_display_size --- The size, in pixels, that the marker should be shown on the minimap or fullscreen map. When applied to a Trail, affects the width of the trail shown on the minimap or fullscreen map. diff --git a/xml_converter/doc/scale/icon_size.md b/xml_converter/doc/scale/icon_size.md index 7f13327e..12480b80 100644 --- a/xml_converter/doc/scale/icon_size.md +++ b/xml_converter/doc/scale/icon_size.md @@ -3,7 +3,8 @@ name: Icon Size type: Float32 applies_to: [Icon] xml_fields: [IconSize] -protobuf_field: tentative__scale +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #tentative__scale --- Multiplier on the size of an image (i.e. 1 is 100%, 2 is 200%). diff --git a/xml_converter/doc/scale/trail_scale.md b/xml_converter/doc/scale/trail_scale.md index 1a9a207e..7a5e7889 100644 --- a/xml_converter/doc/scale/trail_scale.md +++ b/xml_converter/doc/scale/trail_scale.md @@ -3,7 +3,8 @@ name: Trail Scale type: Float32 applies_to: [Trail] xml_fields: [TrailScale] -protobuf_field: scale +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #scale --- Adjusts the width of a trail mesh as a multiplier to the default width. diff --git a/xml_converter/doc/size_on_screen/maximum_size_on_screen.md b/xml_converter/doc/size_on_screen/maximum_size_on_screen.md index 9f483c3e..bddf4094 100644 --- a/xml_converter/doc/size_on_screen/maximum_size_on_screen.md +++ b/xml_converter/doc/size_on_screen/maximum_size_on_screen.md @@ -3,7 +3,8 @@ name: Maximum Size On Screen type: Int32 applies_to: [Icon] xml_fields: [MaxSize] -protobuf_field: maximum_size_on_screen +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #maximum_size_on_screen --- The largest width/height of this icon on the screen. Notes diff --git a/xml_converter/doc/size_on_screen/minimum_size_on_screen.md b/xml_converter/doc/size_on_screen/minimum_size_on_screen.md index 3a41674c..0125d704 100644 --- a/xml_converter/doc/size_on_screen/minimum_size_on_screen.md +++ b/xml_converter/doc/size_on_screen/minimum_size_on_screen.md @@ -3,7 +3,8 @@ name: Minimum Size on Screen type: Int32 applies_to: [Icon] xml_fields: [MinSize] -protobuf_field: minimum_size_on_screen +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #minimum_size_on_screen --- The smallest width/height of this icon on the screen. diff --git a/xml_converter/doc/texture/animation_speed.md b/xml_converter/doc/texture/animation_speed.md index 36e7a055..3d552b80 100644 --- a/xml_converter/doc/texture/animation_speed.md +++ b/xml_converter/doc/texture/animation_speed.md @@ -3,7 +3,8 @@ name: Animation Speed type: Float32 applies_to: [Trail] xml_fields: ["AnimSpeed", "AnimationSpeed"] -protobuf_field: animation_speed +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #animation_speed --- The speed which the texture should be moving across the object. diff --git a/xml_converter/doc/trigger/trigger_range.md b/xml_converter/doc/trigger/trigger_range.md index 621585d8..b002f936 100644 --- a/xml_converter/doc/trigger/trigger_range.md +++ b/xml_converter/doc/trigger/trigger_range.md @@ -3,7 +3,8 @@ name: Trigger Range type: Float32 applies_to: [Icon] xml_fields: [TriggerRange, InfoRange] -protobuf_field: trigger.range +#151 This field should be set to 0 in the protobuf when equal to the default value +protobuf_field: null #trigger.range --- Used to indicate a trigger range. This attribute is used by multiple other attributes to define a distance from the marker in which those attributes will activate their functionality or behavior. diff --git a/xml_converter/integration_tests/test_cases/xml_animation_speed/input/pack/trail.trl b/xml_converter/integration_tests/test_cases/xml_animation_speed/input/pack/trail.trl deleted file mode 100644 index 201ab83c..00000000 Binary files a/xml_converter/integration_tests/test_cases/xml_animation_speed/input/pack/trail.trl and /dev/null differ diff --git a/xml_converter/integration_tests/test_cases/xml_animation_speed/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_animation_speed/input/pack/xml_file.xml deleted file mode 100644 index 92ebf53c..00000000 --- a/xml_converter/integration_tests/test_cases/xml_animation_speed/input/pack/xml_file.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - 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.bin deleted file mode 100644 index 63066120..00000000 Binary files a/xml_converter/integration_tests/test_cases/xml_animation_speed/output_proto/markers.bin and /dev/null differ diff --git a/xml_converter/integration_tests/test_cases/xml_animation_speed/output_xml/037aa160e392f1c8.trl b/xml_converter/integration_tests/test_cases/xml_animation_speed/output_xml/037aa160e392f1c8.trl deleted file mode 100644 index 201ab83c..00000000 Binary files a/xml_converter/integration_tests/test_cases/xml_animation_speed/output_xml/037aa160e392f1c8.trl and /dev/null differ diff --git a/xml_converter/integration_tests/test_cases/xml_animation_speed/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_animation_speed/output_xml/xml_file.xml deleted file mode 100644 index ff5aa933..00000000 --- a/xml_converter/integration_tests/test_cases/xml_animation_speed/output_xml/xml_file.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/xml_converter/integration_tests/test_cases/xml_animation_speed/testcase.yaml b/xml_converter/integration_tests/test_cases/xml_animation_speed/testcase.yaml deleted file mode 100644 index 9510c793..00000000 --- a/xml_converter/integration_tests/test_cases/xml_animation_speed/testcase.yaml +++ /dev/null @@ -1,5 +0,0 @@ -input_paths: - "pack": "xml" -expected_stdout: | -expected_stderr: | -expected_returncode: 0 diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml index afa4bc60..eb8344d5 100644 --- a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml +++ b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml @@ -7,7 +7,7 @@ - + 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.bin index 130cd4f6..899427ea 100644 Binary files a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin and b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin differ diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml index 68ac4112..fbb0a8d8 100644 --- a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml +++ b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml @@ -21,6 +21,6 @@ - + diff --git a/xml_converter/integration_tests/test_cases/xml_fade_distance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_fade_distance/input/pack/xml_file.xml deleted file mode 100644 index c6a9611a..00000000 --- a/xml_converter/integration_tests/test_cases/xml_fade_distance/input/pack/xml_file.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - 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.bin deleted file mode 100644 index d69ff871..00000000 Binary files a/xml_converter/integration_tests/test_cases/xml_fade_distance/output_proto/markers.bin and /dev/null differ diff --git a/xml_converter/integration_tests/test_cases/xml_fade_distance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_fade_distance/output_xml/xml_file.xml deleted file mode 100644 index 0c97ca2c..00000000 --- a/xml_converter/integration_tests/test_cases/xml_fade_distance/output_xml/xml_file.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/xml_converter/integration_tests/test_cases/xml_fade_distance/testcase.yaml b/xml_converter/integration_tests/test_cases/xml_fade_distance/testcase.yaml deleted file mode 100644 index 9510c793..00000000 --- a/xml_converter/integration_tests/test_cases/xml_fade_distance/testcase.yaml +++ /dev/null @@ -1,5 +0,0 @@ -input_paths: - "pack": "xml" -expected_stdout: | -expected_stderr: | -expected_returncode: 0 diff --git a/xml_converter/proto/guildpoint.proto b/xml_converter/proto/guildpoint.proto index 427c8547..58a0959b 100644 --- a/xml_converter/proto/guildpoint.proto +++ b/xml_converter/proto/guildpoint.proto @@ -30,9 +30,9 @@ message Icon { uint32 texture_id = 2; bytes guid = 3; int32 map_id = 4; - float distance_fade_end = 5; - float distance_fade_start = 6; - float height_offset= 7; + // float distance_fade_end = 5; + // float distance_fade_start = 6; + // float height_offset= 7; Position position = 8; Trigger trigger = 9; EulerRotation euler_rotation = 10; @@ -41,9 +41,9 @@ message Icon { int32 achievement_bit_index = 17; bool disable_player_cutout = 19; - int32 minimum_size_on_screen = 20; - int32 map_display_size = 21; - int32 maximum_size_on_screen = 22; + // int32 minimum_size_on_screen = 20; + // int32 map_display_size = 21; + // int32 maximum_size_on_screen = 22; bool constant_size_on_map = 23; string tip_description = 24; string tip_name = 25; @@ -59,7 +59,7 @@ message Icon { bool is_hidden_on_map = 35; bool is_hidden_on_minimap = 36; - float tentative__scale = 2048; + // float tentative__scale = 2048; string bhdraft__schedule = 2052; float bhdraft__schedule_duration = 2053; } @@ -68,16 +68,16 @@ message Trail { uint32 texture_id = 2; bytes guid = 3; int32 map_id = 4; - float distance_fade_end = 5; - float distance_fade_start = 6; + // float distance_fade_end = 5; + // float distance_fade_start = 6; TrailData trail_data = 7; - float animation_speed = 8; + // float animation_speed = 8; int32 achievement_id = 16; int32 achievement_bit_index = 17; bool disable_player_cutout = 19; bool is_wall = 20; - float scale = 21; + // float scale = 21; fixed32 rgba_color = 22; FestivalFilter festival_filter = 23; MapTypeFilter map_type_filter = 24; @@ -85,7 +85,7 @@ message Trail { ProfessionFilter profession_filter = 26; SpecializationFilter specialization_filter = 27; SpeciesFilter species_filter = 28; - int32 map_display_size = 29; + // int32 map_display_size = 29; CullChirality cull_chirality = 30; bool is_hidden_ingame = 31; bool is_hidden_on_map = 32; @@ -118,7 +118,7 @@ message Trigger { string action_info_message = 8; bool invert_display = 9; float reset_length = 10; - float range = 11; + // float range = 11; Category action_hide_category = 12; Category action_show_category = 13; Category action_toggle_category = 14; diff --git a/xml_converter/src/icon_gen.cpp b/xml_converter/src/icon_gen.cpp index ea4817b0..9a91ac73 100644 --- a/xml_converter/src/icon_gen.cpp +++ b/xml_converter/src/icon_gen.cpp @@ -459,14 +459,6 @@ guildpoint::Icon Icon::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_icon](bool val) { proto_icon.set_disable_player_cutout(val); }; bool_to_proto(this->disable_player_cutout, state, setter); } - if (this->distance_fade_end_is_set) { - std::function setter = [&proto_icon](float val) { proto_icon.set_distance_fade_end(val); }; - float_to_proto(this->distance_fade_end, state, setter); - } - if (this->distance_fade_start_is_set) { - std::function setter = [&proto_icon](float val) { proto_icon.set_distance_fade_start(val); }; - float_to_proto(this->distance_fade_start, state, setter); - } if (this->euler_rotation_is_set) { std::function setter = [&proto_icon](guildpoint::EulerRotation* val) { proto_icon.set_allocated_euler_rotation(val); }; euler_rotation_to_proto(this->euler_rotation, state, setter); @@ -483,10 +475,6 @@ guildpoint::Icon Icon::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_icon](bool val) { proto_icon.mutable_trigger()->set_has_countdown(val); }; bool_to_proto(this->has_countdown, state, setter); } - if (this->height_offset_is_set) { - std::function setter = [&proto_icon](float val) { proto_icon.set_height_offset(val); }; - float_to_proto(this->height_offset, state, setter); - } if (this->hide_category_is_set) { std::function setter = [&proto_icon](guildpoint::Category* val) { proto_icon.mutable_trigger()->set_allocated_action_hide_category(val); }; marker_category_to_proto(this->hide_category, state, setter); @@ -495,10 +483,6 @@ guildpoint::Icon Icon::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_icon](unsigned int val) { proto_icon.set_texture_id(val); }; image_to_proto(this->icon, state, setter); } - if (this->icon_size_is_set) { - std::function setter = [&proto_icon](float val) { proto_icon.set_tentative__scale(val); }; - float_to_proto(this->icon_size, state, setter); - } if (this->info_message_is_set) { std::function setter = [&proto_icon](std::string val) { proto_icon.mutable_trigger()->set_action_info_message(val); }; string_to_proto(this->info_message, state, setter); @@ -507,10 +491,6 @@ guildpoint::Icon Icon::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_icon](bool val) { proto_icon.mutable_trigger()->set_invert_display(val); }; bool_to_proto(this->invert_visibility, state, setter); } - if (this->map_display_size_is_set) { - std::function setter = [&proto_icon](int val) { proto_icon.set_map_display_size(val); }; - int_to_proto(this->map_display_size, state, setter); - } if (this->map_id_is_set) { std::function setter = [&proto_icon](int val) { proto_icon.set_map_id(val); }; int_to_proto(this->map_id, state, setter); @@ -519,14 +499,6 @@ guildpoint::Icon Icon::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_icon](guildpoint::MapTypeFilter* val) { proto_icon.set_allocated_map_type_filter(val); }; map_type_filter_to_proto(this->map_type_filter, state, setter); } - if (this->maximum_size_on_screen_is_set) { - std::function setter = [&proto_icon](int val) { proto_icon.set_maximum_size_on_screen(val); }; - int_to_proto(this->maximum_size_on_screen, state, setter); - } - if (this->minimum_size_on_screen_is_set) { - std::function setter = [&proto_icon](int val) { proto_icon.set_minimum_size_on_screen(val); }; - int_to_proto(this->minimum_size_on_screen, state, setter); - } if (this->mount_filter_is_set) { std::function setter = [&proto_icon](guildpoint::MountFilter* val) { proto_icon.set_allocated_mount_filter(val); }; mount_filter_to_proto(this->mount_filter, state, setter); @@ -591,10 +563,6 @@ guildpoint::Icon Icon::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_icon](std::string val) { proto_icon.set_tip_name(val); }; string_to_proto(this->tooltip_name, state, setter); } - if (this->trigger_range_is_set) { - std::function setter = [&proto_icon](float val) { proto_icon.mutable_trigger()->set_range(val); }; - float_to_proto(this->trigger_range, state, setter); - } return proto_icon; } @@ -635,12 +603,6 @@ void Icon::parse_protobuf(guildpoint::Icon proto_icon, ProtoReaderState* state) if (proto_icon.disable_player_cutout() != 0) { proto_to_bool(proto_icon.disable_player_cutout(), state, &(this->disable_player_cutout), &(this->disable_player_cutout_is_set)); } - if (proto_icon.distance_fade_end() != 0) { - proto_to_float(proto_icon.distance_fade_end(), state, &(this->distance_fade_end), &(this->distance_fade_end_is_set)); - } - if (proto_icon.distance_fade_start() != 0) { - proto_to_float(proto_icon.distance_fade_start(), state, &(this->distance_fade_start), &(this->distance_fade_start_is_set)); - } if (proto_icon.has_euler_rotation()) { proto_to_euler_rotation(proto_icon.euler_rotation(), state, &(this->euler_rotation), &(this->euler_rotation_is_set)); } @@ -653,39 +615,24 @@ void Icon::parse_protobuf(guildpoint::Icon proto_icon, ProtoReaderState* state) if (proto_icon.trigger().has_countdown() != 0) { proto_to_bool(proto_icon.trigger().has_countdown(), state, &(this->has_countdown), &(this->has_countdown_is_set)); } - if (proto_icon.height_offset() != 0) { - proto_to_float(proto_icon.height_offset(), state, &(this->height_offset), &(this->height_offset_is_set)); - } if (proto_icon.trigger().has_action_hide_category()) { proto_to_marker_category(proto_icon.trigger().action_hide_category(), state, &(this->hide_category), &(this->hide_category_is_set)); } if (proto_icon.texture_id() != 0) { proto_to_image(proto_icon.texture_id(), state, &(this->icon), &(this->icon_is_set)); } - if (proto_icon.tentative__scale() != 0) { - proto_to_float(proto_icon.tentative__scale(), state, &(this->icon_size), &(this->icon_size_is_set)); - } if (proto_icon.trigger().action_info_message() != "") { proto_to_string(proto_icon.trigger().action_info_message(), state, &(this->info_message), &(this->info_message_is_set)); } if (proto_icon.trigger().invert_display() != 0) { proto_to_bool(proto_icon.trigger().invert_display(), state, &(this->invert_visibility), &(this->invert_visibility_is_set)); } - if (proto_icon.map_display_size() != 0) { - proto_to_int(proto_icon.map_display_size(), state, &(this->map_display_size), &(this->map_display_size_is_set)); - } if (proto_icon.map_id() != 0) { proto_to_int(proto_icon.map_id(), state, &(this->map_id), &(this->map_id_is_set)); } if (proto_icon.has_map_type_filter()) { proto_to_map_type_filter(proto_icon.map_type_filter(), state, &(this->map_type_filter), &(this->map_type_filter_is_set)); } - if (proto_icon.maximum_size_on_screen() != 0) { - proto_to_int(proto_icon.maximum_size_on_screen(), state, &(this->maximum_size_on_screen), &(this->maximum_size_on_screen_is_set)); - } - if (proto_icon.minimum_size_on_screen() != 0) { - proto_to_int(proto_icon.minimum_size_on_screen(), state, &(this->minimum_size_on_screen), &(this->minimum_size_on_screen_is_set)); - } if (proto_icon.has_mount_filter()) { proto_to_mount_filter(proto_icon.mount_filter(), state, &(this->mount_filter), &(this->mount_filter_is_set)); } @@ -734,7 +681,4 @@ void Icon::parse_protobuf(guildpoint::Icon proto_icon, ProtoReaderState* state) if (proto_icon.tip_name() != "") { proto_to_string(proto_icon.tip_name(), state, &(this->tooltip_name), &(this->tooltip_name_is_set)); } - if (proto_icon.trigger().range() != 0) { - proto_to_float(proto_icon.trigger().range(), state, &(this->trigger_range), &(this->trigger_range_is_set)); - } } diff --git a/xml_converter/src/trail_gen.cpp b/xml_converter/src/trail_gen.cpp index 86856d61..6e074fe8 100644 --- a/xml_converter/src/trail_gen.cpp +++ b/xml_converter/src/trail_gen.cpp @@ -257,10 +257,6 @@ guildpoint::Trail Trail::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_trail](int val) { proto_trail.set_achievement_id(val); }; int_to_proto(this->achievement_id, state, setter); } - if (this->animation_speed_is_set) { - std::function setter = [&proto_trail](float val) { proto_trail.set_animation_speed(val); }; - float_to_proto(this->animation_speed, state, setter); - } if (this->color_is_set) { std::function setter = [&proto_trail](uint32_t val) { proto_trail.set_rgba_color(val); }; color_to_proto(this->color, state, setter); @@ -273,14 +269,6 @@ guildpoint::Trail Trail::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_trail](bool val) { proto_trail.set_disable_player_cutout(val); }; bool_to_proto(this->disable_player_cutout, state, setter); } - if (this->distance_fade_end_is_set) { - std::function setter = [&proto_trail](float val) { proto_trail.set_distance_fade_end(val); }; - float_to_proto(this->distance_fade_end, state, setter); - } - if (this->distance_fade_start_is_set) { - std::function setter = [&proto_trail](float val) { proto_trail.set_distance_fade_start(val); }; - float_to_proto(this->distance_fade_start, state, setter); - } if (this->festival_filter_is_set) { std::function setter = [&proto_trail](guildpoint::FestivalFilter* val) { proto_trail.set_allocated_festival_filter(val); }; festival_filter_to_proto(this->festival_filter, state, setter); @@ -293,10 +281,6 @@ guildpoint::Trail Trail::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_trail](bool val) { proto_trail.set_is_wall(val); }; bool_to_proto(this->is_wall, state, setter); } - if (this->map_display_size_is_set) { - std::function setter = [&proto_trail](int val) { proto_trail.set_map_display_size(val); }; - int_to_proto(this->map_display_size, state, setter); - } if (this->map_id_is_set) { std::function setter = [&proto_trail](int val) { proto_trail.set_map_id(val); }; int_to_proto(this->map_id, state, setter); @@ -349,10 +333,6 @@ guildpoint::Trail Trail::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_trail](guildpoint::TrailData* val) { proto_trail.set_allocated_trail_data(val); }; trail_data_to_proto(this->trail_data, state, setter); } - if (this->trail_scale_is_set) { - std::function setter = [&proto_trail](float val) { proto_trail.set_scale(val); }; - float_to_proto(this->trail_scale, state, setter); - } return proto_trail; } @@ -363,9 +343,6 @@ void Trail::parse_protobuf(guildpoint::Trail proto_trail, ProtoReaderState* stat if (proto_trail.achievement_id() != 0) { proto_to_int(proto_trail.achievement_id(), state, &(this->achievement_id), &(this->achievement_id_is_set)); } - if (proto_trail.animation_speed() != 0) { - proto_to_float(proto_trail.animation_speed(), state, &(this->animation_speed), &(this->animation_speed_is_set)); - } if (proto_trail.rgba_color() != 0) { proto_to_color(proto_trail.rgba_color(), state, &(this->color), &(this->color_is_set)); } @@ -375,12 +352,6 @@ void Trail::parse_protobuf(guildpoint::Trail proto_trail, ProtoReaderState* stat if (proto_trail.disable_player_cutout() != 0) { proto_to_bool(proto_trail.disable_player_cutout(), state, &(this->disable_player_cutout), &(this->disable_player_cutout_is_set)); } - if (proto_trail.distance_fade_end() != 0) { - proto_to_float(proto_trail.distance_fade_end(), state, &(this->distance_fade_end), &(this->distance_fade_end_is_set)); - } - if (proto_trail.distance_fade_start() != 0) { - proto_to_float(proto_trail.distance_fade_start(), state, &(this->distance_fade_start), &(this->distance_fade_start_is_set)); - } if (proto_trail.has_festival_filter()) { proto_to_festival_filter(proto_trail.festival_filter(), state, &(this->festival_filter), &(this->festival_filter_is_set)); } @@ -390,9 +361,6 @@ void Trail::parse_protobuf(guildpoint::Trail proto_trail, ProtoReaderState* stat if (proto_trail.is_wall() != 0) { proto_to_bool(proto_trail.is_wall(), state, &(this->is_wall), &(this->is_wall_is_set)); } - if (proto_trail.map_display_size() != 0) { - proto_to_int(proto_trail.map_display_size(), state, &(this->map_display_size), &(this->map_display_size_is_set)); - } if (proto_trail.map_id() != 0) { proto_to_int(proto_trail.map_id(), state, &(this->map_id), &(this->map_id_is_set)); } @@ -432,7 +400,4 @@ void Trail::parse_protobuf(guildpoint::Trail proto_trail, ProtoReaderState* stat if (proto_trail.has_trail_data()) { proto_to_trail_data(proto_trail.trail_data(), state, &(this->trail_data), &(this->trail_data_is_set)); } - if (proto_trail.scale() != 0) { - proto_to_float(proto_trail.scale(), state, &(this->trail_scale), &(this->trail_scale_is_set)); - } }