wip cr stats window

Author: rainlizard

Scenes/CompareCreatureStats.gd

@@ -6,7 +6,6 @@ onready var oStatsOptionButton = Nodelist.list["oStatsOptionButton"]
 
 var all_creature_data = {}
 
-var list_data = []
 var selected_labels = []
 
 func _ready():
@@ -18,7 +17,6 @@ func _ready():
 	for path in listOfCfgs:
 		var aaa = Utils.read_dkcfg_file(path)
 		all_creature_data[path.get_file()] = aaa
-	#print(creature_data)
 
 	print('Codetime: ' + str(OS.get_ticks_msec() - CODETIME_START) + 'ms')
 
@@ -31,30 +29,61 @@ func _ready():
 
 	Utils.popup_centered(self)
 
-func _on_StatsOptionButton_item_selected(index):
-	update_list()
+func _on_StatsOptionButton_item_selected(optionButtonIndex):
+	update_list(optionButtonIndex)
 
-func update_list():
+func update_list(optionButtonIndex):
+	
+	var list_data = []
+	for i in oSortCreaStatsGrid.get_children():
+		i.free()
+	
+	var optionButtonMeta = oStatsOptionButton.get_item_metadata(optionButtonIndex)
+	
 	for file in all_creature_data:
+		var getName = all_creature_data[file].get("attributes").get("Name")
 		for section in all_creature_data[file]:
-			if section == "attributes":
-				var getName = all_creature_data[file][section].get("Name")
-				var getHealth = all_creature_data[file][section].get("Health")
+			if section == optionButtonMeta[0]:
 
-				list_data.append([getName, getHealth])
+				var getValue = all_creature_data[file][section].get(optionButtonMeta[1])
+				list_data.append([getName, getValue])
 
 	list_data.sort_custom(self, "sort_list")
-	
 	for i in list_data:
-		add_entry(i[0], i[1], Color(0.5,0.5,0.5))
+		var col = Color(0.5,0.5,0.5)
+		var label_text = str(i[0])  # Create a single string with a separator
+		if label_text in selected_labels:
+			col = Color(1.0,1.0,1.0)
+		add_entry(i[0], i[1], col)
 
 
 func sort_list(a, b):
-	return int(a[1]) < int(b[1])
+	
+	var compareA
+	var compareB
+	
+	if a[1] is int:
+		compareA = a[1]
+	elif a[1] is String:
+		compareA = a[1].length()
+	elif a[1] is Array:
+		compareA = int(a[1][0])
+	else:
+		compareA = 0
+	
+	if b[1] is int:
+		compareB = b[1]
+	elif b[1] is String:
+		compareB = b[1].length()
+	elif b[1] is Array:
+		compareB = int(b[1][0])
+	else:
+		compareB = 0
+	return compareA < compareB
 
 func add_entry(string1, value, fontColor):
 	var addLabel1 = Label.new()
-	addLabel1.text = string1
+	addLabel1.text = str(string1)
 	oSortCreaStatsGrid.add_child(addLabel1)
 	addLabel1.set("custom_colors/font_color", fontColor)
 	addLabel1.mouse_filter = Control.MOUSE_FILTER_PASS
@@ -78,33 +107,35 @@ func add_entry(string1, value, fontColor):
 	addLabel2.connect("gui_input", self, "_on_label_gui_input", [addLabel1, addLabel2])
 
 func _on_label_mouse_entered(l1,l2):
-	if [l1, l2] in selected_labels:
+	if l1.text in selected_labels:
 		pass
 	else:
 		l1.set("custom_colors/font_color", Color(1,1,1))
 		l2.set("custom_colors/font_color", Color(1,1,1))
 
 func _on_label_mouse_exited(l1,l2):
-	if [l1, l2] in selected_labels:
+	if l1.text in selected_labels:
 		pass
 	else:
 		l1.set("custom_colors/font_color", Color(0.5,0.5,0.5))
 		l2.set("custom_colors/font_color", Color(0.5,0.5,0.5))
 
 func _on_label_gui_input(event, l1, l2):
 	if event is InputEventMouseButton and event.pressed and event.button_index == BUTTON_LEFT:
-		if [l1, l2] in selected_labels:
-			selected_labels.erase([l1, l2])
-			l1.set("custom_colors/font_color", Color(0.5, 0.5, 0.5))
-			l2.set("custom_colors/font_color", Color(0.5, 0.5, 0.5))
+		var label_text = l1.text
+		if label_text in selected_labels:
+			selected_labels.erase(label_text)
+			l1.set("custom_colors/font_color", Color(0.5,0.5,0.5))
+			l2.set("custom_colors/font_color", Color(0.5,0.5,0.5))
 		else:
-			selected_labels.append([l1, l2])
+			selected_labels.append(label_text)
 			l1.set("custom_colors/font_color", Color(1, 1, 1))
 			l2.set("custom_colors/font_color", Color(1, 1, 1))
 
 func _on_NameStatsButton_pressed():
-	pass # Replace with function body.
-
+	selected_labels.clear()
+	
+	
 
 
 
@@ -118,6 +149,7 @@ func _on_RightStatsButton_pressed():
 		while next_index < oStatsOptionButton.selected and oStatsOptionButton.get_item_text(next_index) == "":
 			next_index += 1
 	oStatsOptionButton.selected = next_index
+	_on_StatsOptionButton_item_selected(next_index)
 
 func _on_LeftStatsButton_pressed():
 	var prev_index = oStatsOptionButton.selected - 1
@@ -128,14 +160,17 @@ func _on_LeftStatsButton_pressed():
 		while prev_index > oStatsOptionButton.selected and oStatsOptionButton.get_item_text(prev_index) == "":
 			prev_index -= 1
 	oStatsOptionButton.selected = prev_index
+	_on_StatsOptionButton_item_selected(prev_index)
 
 
 func populate_optionbutton():
 	var items_checked = 0
 	for file in all_creature_data:
-		items_checked+=1
+		items_checked += 1
 		for section in all_creature_data[file]:
 			if items_checked == 1:
-				for blah in all_creature_data[file][section].keys():
-					oStatsOptionButton.add_item(blah)
+				for key in all_creature_data[file][section].keys():
+					var idx = oStatsOptionButton.get_item_count()
+					oStatsOptionButton.add_item(key)
+					oStatsOptionButton.set_item_metadata(idx, [section, key])
 				oStatsOptionButton.add_separator()

Scenes/Main.tscn

@@ -6836,20 +6836,20 @@ size_flags_vertical = 3
 margin_right = 309.0
 margin_bottom = 27.0
 
+[node name="StatsOptionButton" type="OptionButton" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer"]
+margin_right = 247.0
+margin_bottom = 27.0
+size_flags_horizontal = 3
+text = "Sections"
+
 [node name="LeftStatsButton" type="Button" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer"]
-margin_right = 27.0
+margin_left = 251.0
+margin_right = 278.0
 margin_bottom = 27.0
 rect_min_size = Vector2( 27, 27 )
 size_flags_horizontal = 0
 text = "<"
 
-[node name="StatsOptionButton" type="OptionButton" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer"]
-margin_left = 31.0
-margin_right = 278.0
-margin_bottom = 27.0
-size_flags_horizontal = 3
-text = "Sections"
-
 [node name="RightStatsButton" type="Button" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer"]
 margin_left = 282.0
 margin_right = 309.0
@@ -7640,8 +7640,8 @@ script = SubResource( 20 )
 [connection signal="pressed" from="Ui/UiSystem/ResizeCurrentMapSize/MarginContainer/VBoxContainer/ResizeApplyButton" to="Ui/UiSystem/ResizeCurrentMapSize" method="_on_ResizeApplyButton_pressed"]
 [connection signal="visibility_changed" from="Ui/UiSystem/GridDataWindow" to="Game2D/AnalyzeGrids" method="_on_GridDataWindow_visibility_changed"]
 [connection signal="visibility_changed" from="Ui/UiSystem/ActionPointListWindow" to="Ui/UiSystem/ActionPointListWindow/MarginContainer/VBoxContainer/ScrollContainer/ActionPointList" method="_on_ActionPointListWindow_visibility_changed"]
-[connection signal="pressed" from="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer/LeftStatsButton" to="Ui/UiSystem/SortCreatureStats" method="_on_LeftStatsButton_pressed"]
 [connection signal="item_selected" from="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer/StatsOptionButton" to="Ui/UiSystem/SortCreatureStats" method="_on_StatsOptionButton_item_selected"]
+[connection signal="pressed" from="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer/LeftStatsButton" to="Ui/UiSystem/SortCreatureStats" method="_on_LeftStatsButton_pressed"]
 [connection signal="pressed" from="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer/RightStatsButton" to="Ui/UiSystem/SortCreatureStats" method="_on_RightStatsButton_pressed"]
 [connection signal="pressed" from="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer2/NameStatsButton" to="Ui/UiSystem/SortCreatureStats" method="_on_NameStatsButton_pressed"]
 [connection signal="visibility_changed" from="Ui/UiSystem/MapCoordinatesWindow" to="Ui/UiSystem/MapCoordinatesWindow" method="_on_MapCoordinatesWindow_visibility_changed"]