Merge pull request AsherGlick#356 from klingbolt/guildpoint_over_wayp…

…oint

Changed the name waypoint to guildpoint

.github/workflows/diff_protobin.yml

@@ -27,14 +27,14 @@ jobs:
           mkdir -p $(dirname "$file")
           if [ -n "$(git ls-tree "origin/${{ github.base_ref }}" -- "$file")" ]; then
             git show origin/${{ github.base_ref }}:$file > $file._old
-            protoc --decode=waypoint.Waypoint xml_converter/proto/waypoint.proto < $file._old > $file.textproto._old
+            protoc --decode=guildpoint.Guildpoint xml_converter/proto/guildpoint.proto < $file._old > $file.textproto._old
           else
             touch $file.textproto._old
           fi
 
           if [ -n "$(git ls-tree "refs/pull/${{ github.event.pull_request.number }}/head" -- "$file")" ]; then
             git show refs/pull/${{ github.event.pull_request.number }}/head:$file > $file._new
-            protoc --decode=waypoint.Waypoint xml_converter/proto/waypoint.proto < $file._new > $file.textproto._new
+            protoc --decode=guildpoint.Guildpoint xml_converter/proto/guildpoint.proto < $file._new > $file.textproto._new
           else
             touch $file.textproto._new
           fi

CategoryData.gd

@@ -1,6 +1,6 @@
-const Waypoint = preload("res://waypoint.gd")
+const Guildpoint = preload("res://guildpoint.gd")
 
 var category3d: Spatial
 var category2d: Node2D
-var waypoint_category: Waypoint.Category
+var guildpoint_category: Guildpoint.Category
 var is_visible = false

Icon.gd

@@ -1,8 +1,8 @@
 extends Sprite3D
 
-const Waypoint = preload("res://waypoint.gd")
+const Guildpoint = preload("res://guildpoint.gd")
 
-var waypoint: Waypoint.Icon
+var guildpoint: Guildpoint.Icon
 var category: TreeItem
 
 func set_icon_image(texture_path: String):

ImportPackDialog.gd

@@ -19,7 +19,7 @@ func _on_FileDialog_dir_selected(dir_path: String):
 	FileHandler.create_directory_if_missing(new_path)
 	var args: PoolStringArray = [
 		"--input-taco-path", dir_path,
-		"--output-waypoint-path", new_path,
-		"--output-split-waypoint-path", self.unsaved_markers_dir
+		"--output-guildpoint-path", new_path,
+		"--output-split-guildpoint-path", self.unsaved_markers_dir
 	]
 	FileHandler.call_xml_converter(args)

Trail2D.gd

@@ -1,11 +1,11 @@
 extends Line2D
 
-const Waypoint = preload("res://waypoint.gd")
-var waypoint: Waypoint.Trail
+const Guildpoint = preload("res://guildpoint.gd")
+var guildpoint: Guildpoint.Trail
 
 func refresh_points():
 	var trail_points := PoolVector2Array()
-	var trail_data = self.waypoint.get_trail_data()
+	var trail_data = self.guildpoint.get_trail_data()
 	for index in range(0, trail_data.get_points_z().size()):
 		trail_points.append(Vector2(trail_data.get_points_x()[index], -trail_data.get_points_z()[index]))
 	self.points = trail_points

Trail3D.gd

@@ -1,17 +1,17 @@
 extends Spatial
 
-const Waypoint = preload("res://waypoint.gd")
+const Guildpoint = preload("res://guildpoint.gd")
 
 var texture_path
 var color = Color(0.9, 0.1, 0.1)
-var waypoint: Waypoint.Trail
+var guildpoint: Guildpoint.Trail
 var category: TreeItem
 
 func refresh_mesh():
 	var tmpMesh = Mesh.new()
 	var i = 0
 	var last_uv: float = 0.0
-	var trail_data = self.waypoint.get_trail_data()
+	var trail_data = self.guildpoint.get_trail_data()
 	for point_index in range(trail_data.get_points_x().size()-1):
 		var point:Vector3 = Vector3(trail_data.get_points_x()[point_index], trail_data.get_points_y()[point_index], -trail_data.get_points_z()[point_index])
 		var next_point:Vector3 = Vector3(trail_data.get_points_x()[point_index+1], trail_data.get_points_y()[point_index+1], -trail_data.get_points_z()[point_index+1])

waypoint.gd → guildpoint.gd

@@ -660,7 +660,7 @@ class PBPacker:
 ############### USER DATA BEGIN ################
 
 
-class Waypoint:
+class Guildpoint:
 	func _init():
 		var service
 
@@ -794,10 +794,10 @@ class Category:
 		service.field = _is_separator
 		data[_is_separator.tag] = service
 
-		_default_visibility = PBField.new("default_visibility", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 6, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_is_hidden = PBField.new("is_hidden", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 6, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
 		service = PBServiceField.new()
-		service.field = _default_visibility
-		data[_default_visibility.tag] = service
+		service.field = _is_hidden
+		data[_is_hidden.tag] = service
 
 		_tip_description = PBField.new("tip_description", PB_DATA_TYPE.STRING, PB_RULE.OPTIONAL, 7, true, DEFAULT_VALUES_3[PB_DATA_TYPE.STRING])
 		service = PBServiceField.new()
@@ -862,14 +862,14 @@ class Category:
 	func set_is_separator(value : bool) -> void:
 		_is_separator.value = value
 
-	var _default_visibility: PBField
-	func get_default_visibility() -> bool:
-		return _default_visibility.value
-	func clear_default_visibility() -> void:
+	var _is_hidden: PBField
+	func get_is_hidden() -> bool:
+		return _is_hidden.value
+	func clear_is_hidden() -> void:
 		data[6].state = PB_SERVICE_STATE.UNFILLED
-		_default_visibility.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_default_visibility(value : bool) -> void:
-		_default_visibility.value = value
+		_is_hidden.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	func set_is_hidden(value : bool) -> void:
+		_is_hidden.value = value
 
 	var _tip_description: PBField
 	func get_tip_description() -> String:
@@ -992,10 +992,10 @@ class Icon:
 		service.field = _maximum_size_on_screen
 		data[_maximum_size_on_screen.tag] = service
 
-		_scale_on_map_with_zoom = PBField.new("scale_on_map_with_zoom", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 23, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_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 = _scale_on_map_with_zoom
-		data[_scale_on_map_with_zoom.tag] = service
+		service.field = _constant_size_on_map
+		data[_constant_size_on_map.tag] = service
 
 		_tip_description = PBField.new("tip_description", PB_DATA_TYPE.STRING, PB_RULE.OPTIONAL, 24, true, DEFAULT_VALUES_3[PB_DATA_TYPE.STRING])
 		service = PBServiceField.new()
@@ -1053,25 +1053,25 @@ class Icon:
 		service.field = _cull_chirality
 		data[_cull_chirality.tag] = service
 
-		_tentative__scale = PBField.new("tentative__scale", PB_DATA_TYPE.FLOAT, PB_RULE.OPTIONAL, 2048, true, DEFAULT_VALUES_3[PB_DATA_TYPE.FLOAT])
+		_is_hidden_ingame = PBField.new("is_hidden_ingame", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 34, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
 		service = PBServiceField.new()
-		service.field = _tentative__scale
-		data[_tentative__scale.tag] = service
+		service.field = _is_hidden_ingame
+		data[_is_hidden_ingame.tag] = service
 
-		_tentative__render_ingame = PBField.new("tentative__render_ingame", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 2049, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_is_hidden_on_map = PBField.new("is_hidden_on_map", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 35, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
 		service = PBServiceField.new()
-		service.field = _tentative__render_ingame
-		data[_tentative__render_ingame.tag] = service
+		service.field = _is_hidden_on_map
+		data[_is_hidden_on_map.tag] = service
 
-		_tentative__render_on_map = PBField.new("tentative__render_on_map", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 2050, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_is_hidden_on_minimap = PBField.new("is_hidden_on_minimap", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 36, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
 		service = PBServiceField.new()
-		service.field = _tentative__render_on_map
-		data[_tentative__render_on_map.tag] = service
+		service.field = _is_hidden_on_minimap
+		data[_is_hidden_on_minimap.tag] = service
 
-		_tentative__render_on_minimap = PBField.new("tentative__render_on_minimap", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 2051, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_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__render_on_minimap
-		data[_tentative__render_on_minimap.tag] = service
+		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()
@@ -1223,14 +1223,14 @@ class Icon:
 	func set_maximum_size_on_screen(value : int) -> void:
 		_maximum_size_on_screen.value = value
 
-	var _scale_on_map_with_zoom: PBField
-	func get_scale_on_map_with_zoom() -> bool:
-		return _scale_on_map_with_zoom.value
-	func clear_scale_on_map_with_zoom() -> void:
+	var _constant_size_on_map: PBField
+	func get_constant_size_on_map() -> bool:
+		return _constant_size_on_map.value
+	func clear_constant_size_on_map() -> void:
 		data[23].state = PB_SERVICE_STATE.UNFILLED
-		_scale_on_map_with_zoom.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_scale_on_map_with_zoom(value : bool) -> void:
-		_scale_on_map_with_zoom.value = value
+		_constant_size_on_map.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	func set_constant_size_on_map(value : bool) -> void:
+		_constant_size_on_map.value = value
 
 	var _tip_description: PBField
 	func get_tip_description() -> String:
@@ -1328,6 +1328,33 @@ class Icon:
 	func set_cull_chirality(value) -> void:
 		_cull_chirality.value = value
 
+	var _is_hidden_ingame: PBField
+	func get_is_hidden_ingame() -> bool:
+		return _is_hidden_ingame.value
+	func clear_is_hidden_ingame() -> void:
+		data[34].state = PB_SERVICE_STATE.UNFILLED
+		_is_hidden_ingame.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	func set_is_hidden_ingame(value : bool) -> void:
+		_is_hidden_ingame.value = value
+
+	var _is_hidden_on_map: PBField
+	func get_is_hidden_on_map() -> bool:
+		return _is_hidden_on_map.value
+	func clear_is_hidden_on_map() -> void:
+		data[35].state = PB_SERVICE_STATE.UNFILLED
+		_is_hidden_on_map.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	func set_is_hidden_on_map(value : bool) -> void:
+		_is_hidden_on_map.value = value
+
+	var _is_hidden_on_minimap: PBField
+	func get_is_hidden_on_minimap() -> bool:
+		return _is_hidden_on_minimap.value
+	func clear_is_hidden_on_minimap() -> void:
+		data[36].state = PB_SERVICE_STATE.UNFILLED
+		_is_hidden_on_minimap.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	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
@@ -1337,33 +1364,6 @@ class Icon:
 	func set_tentative__scale(value : float) -> void:
 		_tentative__scale.value = value
 
-	var _tentative__render_ingame: PBField
-	func get_tentative__render_ingame() -> bool:
-		return _tentative__render_ingame.value
-	func clear_tentative__render_ingame() -> void:
-		data[2049].state = PB_SERVICE_STATE.UNFILLED
-		_tentative__render_ingame.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_tentative__render_ingame(value : bool) -> void:
-		_tentative__render_ingame.value = value
-
-	var _tentative__render_on_map: PBField
-	func get_tentative__render_on_map() -> bool:
-		return _tentative__render_on_map.value
-	func clear_tentative__render_on_map() -> void:
-		data[2050].state = PB_SERVICE_STATE.UNFILLED
-		_tentative__render_on_map.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_tentative__render_on_map(value : bool) -> void:
-		_tentative__render_on_map.value = value
-
-	var _tentative__render_on_minimap: PBField
-	func get_tentative__render_on_minimap() -> bool:
-		return _tentative__render_on_minimap.value
-	func clear_tentative__render_on_minimap() -> void:
-		data[2051].state = PB_SERVICE_STATE.UNFILLED
-		_tentative__render_on_minimap.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_tentative__render_on_minimap(value : bool) -> void:
-		_tentative__render_on_minimap.value = value
-
 	var _bhdraft__schedule: PBField
 	func get_bhdraft__schedule() -> String:
 		return _bhdraft__schedule.value
@@ -1519,20 +1519,20 @@ class Trail:
 		service.field = _cull_chirality
 		data[_cull_chirality.tag] = service
 
-		_tentative__render_ingame = PBField.new("tentative__render_ingame", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 2049, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_is_hidden_ingame = PBField.new("is_hidden_ingame", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 31, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
 		service = PBServiceField.new()
-		service.field = _tentative__render_ingame
-		data[_tentative__render_ingame.tag] = service
+		service.field = _is_hidden_ingame
+		data[_is_hidden_ingame.tag] = service
 
-		_tentative__render_on_map = PBField.new("tentative__render_on_map", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 2050, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_is_hidden_on_map = PBField.new("is_hidden_on_map", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 32, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
 		service = PBServiceField.new()
-		service.field = _tentative__render_on_map
-		data[_tentative__render_on_map.tag] = service
+		service.field = _is_hidden_on_map
+		data[_is_hidden_on_map.tag] = service
 
-		_tentative__render_on_minimap = PBField.new("tentative__render_on_minimap", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 2051, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
+		_is_hidden_on_minimap = PBField.new("is_hidden_on_minimap", PB_DATA_TYPE.BOOL, PB_RULE.OPTIONAL, 33, true, DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL])
 		service = PBServiceField.new()
-		service.field = _tentative__render_on_minimap
-		data[_tentative__render_on_minimap.tag] = service
+		service.field = _is_hidden_on_minimap
+		data[_is_hidden_on_minimap.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()
@@ -1742,32 +1742,32 @@ class Trail:
 	func set_cull_chirality(value) -> void:
 		_cull_chirality.value = value
 
-	var _tentative__render_ingame: PBField
-	func get_tentative__render_ingame() -> bool:
-		return _tentative__render_ingame.value
-	func clear_tentative__render_ingame() -> void:
-		data[2049].state = PB_SERVICE_STATE.UNFILLED
-		_tentative__render_ingame.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_tentative__render_ingame(value : bool) -> void:
-		_tentative__render_ingame.value = value
-
-	var _tentative__render_on_map: PBField
-	func get_tentative__render_on_map() -> bool:
-		return _tentative__render_on_map.value
-	func clear_tentative__render_on_map() -> void:
-		data[2050].state = PB_SERVICE_STATE.UNFILLED
-		_tentative__render_on_map.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_tentative__render_on_map(value : bool) -> void:
-		_tentative__render_on_map.value = value
-
-	var _tentative__render_on_minimap: PBField
-	func get_tentative__render_on_minimap() -> bool:
-		return _tentative__render_on_minimap.value
-	func clear_tentative__render_on_minimap() -> void:
-		data[2051].state = PB_SERVICE_STATE.UNFILLED
-		_tentative__render_on_minimap.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
-	func set_tentative__render_on_minimap(value : bool) -> void:
-		_tentative__render_on_minimap.value = value
+	var _is_hidden_ingame: PBField
+	func get_is_hidden_ingame() -> bool:
+		return _is_hidden_ingame.value
+	func clear_is_hidden_ingame() -> void:
+		data[31].state = PB_SERVICE_STATE.UNFILLED
+		_is_hidden_ingame.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	func set_is_hidden_ingame(value : bool) -> void:
+		_is_hidden_ingame.value = value
+
+	var _is_hidden_on_map: PBField
+	func get_is_hidden_on_map() -> bool:
+		return _is_hidden_on_map.value
+	func clear_is_hidden_on_map() -> void:
+		data[32].state = PB_SERVICE_STATE.UNFILLED
+		_is_hidden_on_map.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	func set_is_hidden_on_map(value : bool) -> void:
+		_is_hidden_on_map.value = value
+
+	var _is_hidden_on_minimap: PBField
+	func get_is_hidden_on_minimap() -> bool:
+		return _is_hidden_on_minimap.value
+	func clear_is_hidden_on_minimap() -> void:
+		data[33].state = PB_SERVICE_STATE.UNFILLED
+		_is_hidden_on_minimap.value = DEFAULT_VALUES_3[PB_DATA_TYPE.BOOL]
+	func set_is_hidden_on_minimap(value : bool) -> void:
+		_is_hidden_on_minimap.value = value
 
 	var _bhdraft__schedule: PBField
 	func get_bhdraft__schedule() -> String:

xml_converter/CMakeLists.txt

@@ -15,7 +15,7 @@ set(CORE_LIB core_lib)
 FIND_PACKAGE(Protobuf REQUIRED)
 INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-PROTOBUF_GENERATE_CPP(PROTO_SRC PROTO_HEADER proto/waypoint.proto)
+PROTOBUF_GENERATE_CPP(PROTO_SRC PROTO_HEADER proto/guildpoint.proto)
 
 # Add Dependencies
 file(GLOB_RECURSE SOURCES "src/*.cpp")

xml_converter/doc/disable_player_cutout/disable_player_cutout.md

@@ -14,7 +14,7 @@ custom_functions:
 ---
 A flag to determine if an object can be made transparent when it is possibly occluding the player.
 
-This value is inverted between the waypoint format value of "Disable Player Cutout" and the TacO xml format of "Can Fade"
+This value is inverted between the guildpoint format value of "Disable Player Cutout" and the TacO xml format of "Can Fade"
 
 
 Notes

xml_converter/generators/cpp_templates/attribute_template.hpp

@@ -10,7 +10,7 @@
 #include "../state_structs/xml_reader_state.hpp"
 #include "../state_structs/xml_writer_state.hpp"
 {% if type == "Enum" %}
-    #include "waypoint.pb.h"
+    #include "guildpoint.pb.h"
 
     class XMLError;
 

xml_converter/generators/cpp_templates/attribute_template_compoundvalue.cpp

@@ -7,7 +7,7 @@
 #include "../rapid_helpers.hpp"
 #include "../rapidxml-1.13/rapidxml.hpp"
 #include "../string_helper.hpp"
-#include "waypoint.pb.h"
+#include "guildpoint.pb.h"
 
 using namespace std;