creature stats comparison window done

Author: rainlizard

Autoload/Version.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var major_minor = "0.47"
+var major_minor = "0.48"
 var patch = "0000"
 var full = ""
 var unearth_map_format_version:float = 1.05

Scenes/CfgLoader.gd

@@ -66,6 +66,8 @@ func load_objects_data(path):
 				Things.DATA_OBJECT[id] = [newName, newSprite, newEditorTab]
 
 func load_terrain_data(path):
+	return #!!!!!!!
+	
 	var terrain_cfg = Utils.read_dkcfg_file(path)
 	for section in terrain_cfg:
 		if section.begins_with("slab"):

Scenes/CompareCreatureStats.gd

@@ -2,32 +2,28 @@ extends WindowDialog
 onready var oGame = Nodelist.list["oGame"]
 onready var oSortCreaStatsGrid = Nodelist.list["oSortCreaStatsGrid"]
 onready var oStatsOptionButton = Nodelist.list["oStatsOptionButton"]
+onready var oMessage = Nodelist.list["oMessage"]
 
+var name_type = 0
 
 var all_creature_data = {}
 
 var selected_labels = []
+func _on_SortCreatureStats_visibility_changed():
+	if visible == true:
+		start()
 
-func _ready():
-	for i in 10:
-		yield(get_tree(),'idle_frame')
-	
-	var CODETIME_START = OS.get_ticks_msec()
+func start():
 	var listOfCfgs = Utils.get_filetype_in_directory(oGame.GAME_DIRECTORY.plus_file("creatrs"), "CFG")
 	for path in listOfCfgs:
 		var aaa = Utils.read_dkcfg_file(path)
 		all_creature_data[path.get_file()] = aaa
 
-	print('Codetime: ' + str(OS.get_ticks_msec() - CODETIME_START) + 'ms')
-	
 	populate_optionbutton()
 
-	
 	# Default selection
 	oStatsOptionButton.select(2)
 	_on_StatsOptionButton_item_selected(2)
-	
-	Utils.popup_centered(self)
 
 func _on_StatsOptionButton_item_selected(optionButtonIndex):
 	update_list(optionButtonIndex)
@@ -41,7 +37,8 @@ func update_list(optionButtonIndex):
 	var optionButtonMeta = oStatsOptionButton.get_item_metadata(optionButtonIndex)
 
 	for file in all_creature_data:
-		var getName = all_creature_data[file].get("attributes").get("Name")
+		var getName = figure_out_name(all_creature_data[file].get("attributes").get("Name"), file)
+		
 		for section in all_creature_data[file]:
 			if section == optionButtonMeta[0]:
 
@@ -56,6 +53,16 @@ func update_list(optionButtonIndex):
 			col = Color(1.0,1.0,1.0)
 		add_entry(i[0], i[1], col)
 
+func figure_out_name(NAME_ID, file):
+	match name_type:
+		0:
+			var subtype = Things.find_subtype_by_name(Things.TYPE.CREATURE, NAME_ID)
+			return Things.fetch_name(Things.TYPE.CREATURE, subtype)
+		1:
+			return NAME_ID
+		2: 
+			return file
+
 
 func sort_list(a, b):
 
@@ -134,10 +141,9 @@ func _on_label_gui_input(event, l1, l2):
 
 func _on_NameStatsButton_pressed():
 	selected_labels.clear()
-	
-	
-
-
+	name_type += 1
+	if name_type >= 3: name_type = 0
+	update_list(oStatsOptionButton.selected)
 
 
 func _on_RightStatsButton_pressed():
@@ -174,3 +180,11 @@ func populate_optionbutton():
 					oStatsOptionButton.add_item(key)
 					oStatsOptionButton.set_item_metadata(idx, [section, key])
 				oStatsOptionButton.add_separator()
+
+
+func _on_CCStatsHelpButton_pressed():
+	var helptxt = ""
+	helptxt += "These files are currently only loaded from the main /creatrs/ directory, not from anywhere else."
+	oMessage.big("Help",helptxt)
+
+

Scenes/Main.tscn

@@ -1699,7 +1699,7 @@ custom_colors/font_color_hover = Color( 1, 0.65098, 0.556863, 1 )
 custom_colors/font_color_pressed = Color( 0.333333, 0.607843, 1, 1 )
 text = "View"
 align = 0
-items = [ "Map folder", null, 0, false, false, 0, 0, null, "", false, "Script file", null, 0, false, false, 1, 0, null, "", false, "Log file", null, 0, false, false, 2, 0, null, "", false, "", null, 0, false, true, -1, 0, null, "", true, "3D: 1st person", null, 0, false, false, 3, 0, null, "", false, "", null, 0, false, true, -1, 0, null, "", true, "Action points", null, 0, false, false, 4, 0, null, "", false, "Grid data", null, 0, false, false, 5, 0, null, "", false ]
+items = [ "Map folder", null, 0, false, false, 0, 0, null, "", false, "Script file", null, 0, false, false, 1, 0, null, "", false, "Log file", null, 0, false, false, 2, 0, null, "", false, "", null, 0, false, true, -1, 0, null, "", true, "3D: 1st person", null, 0, false, false, 3, 0, null, "", false, "", null, 0, false, true, -1, 0, null, "", true, "Action points", null, 0, false, false, 4, 0, null, "", false, "Grid data", null, 0, false, false, 5, 0, null, "", false, "Creature Stats", null, 0, false, false, 6, 0, null, "", false ]
 switch_on_hover = true
 __meta__ = {
 "_edit_use_anchors_": false
@@ -6809,7 +6809,7 @@ margin_right = 2053.0
 margin_bottom = -886.0
 rect_min_size = Vector2( 281, 296 )
 mouse_filter = 1
-window_title = "Compare Creature Stats"
+window_title = "Creature Stat Comparison"
 resizable = true
 script = ExtResource( 170 )
 
@@ -6859,31 +6859,44 @@ size_flags_horizontal = 0
 text = ">"
 
 [node name="ScrollContainer" type="ScrollContainer" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer"]
-anchor_right = 1.0
-anchor_bottom = 1.0
+margin_top = 31.0
+margin_right = 309.0
+margin_bottom = 870.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="SortCreaStatsGrid" type="GridContainer" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/ScrollContainer"]
-anchor_right = 1.0
-anchor_bottom = 1.0
+margin_right = 309.0
+margin_bottom = 839.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/hseparation = 20
 columns = 2
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer"]
-margin_top = 879.0
+margin_top = 874.0
 margin_right = 309.0
 margin_bottom = 906.0
 
 [node name="NameStatsButton" type="Button" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer2"]
 margin_right = 100.0
-margin_bottom = 27.0
+margin_bottom = 32.0
 rect_min_size = Vector2( 100, 0 )
 size_flags_horizontal = 2
 text = "Name"
 
+[node name="CCStatsHelpButton" type="TextureButton" parent="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer2"]
+margin_left = 277.0
+margin_right = 309.0
+margin_bottom = 32.0
+rect_min_size = Vector2( 32, 32 )
+size_flags_horizontal = 8
+texture_normal = ExtResource( 156 )
+texture_pressed = ExtResource( 66 )
+texture_hover = ExtResource( 128 )
+expand = true
+stretch_mode = 4
+
 [node name="MapCoordinatesWindow" type="WindowDialog" parent="Ui/UiSystem"]
 visible = true
 margin_left = -1480.0
@@ -7640,10 +7653,12 @@ 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="visibility_changed" from="Ui/UiSystem/SortCreatureStats" to="Ui/UiSystem/SortCreatureStats" method="_on_SortCreatureStats_visibility_changed"]
 [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="pressed" from="Ui/UiSystem/SortCreatureStats/MarginContainer/VBoxContainer/HBoxContainer2/CCStatsHelpButton" to="Ui/UiSystem/SortCreatureStats" method="_on_CCStatsHelpButton_pressed"]
 [connection signal="visibility_changed" from="Ui/UiSystem/MapCoordinatesWindow" to="Ui/UiSystem/MapCoordinatesWindow" method="_on_MapCoordinatesWindow_visibility_changed"]
 [connection signal="gui_input" from="Ui/UiSystem/MapCoordinatesWindow/MarginContainer/VBoxContainer/LandviewAspectRatioContainer/LandviewImage" to="Ui/UiSystem/MapCoordinatesWindow" method="_on_LandviewImage_gui_input"]
 [connection signal="resized" from="Ui/UiSystem/MapCoordinatesWindow/MarginContainer/VBoxContainer/LandviewAspectRatioContainer/LandviewImage" to="Ui/UiSystem/MapCoordinatesWindow" method="_on_LandviewImage_resized"]

Scenes/Menu.gd

@@ -41,6 +41,7 @@ onready var oGridDataWindow = Nodelist.list["oGridDataWindow"]
 onready var oCamera2D = Nodelist.list["oCamera2D"]
 onready var oActionPointListWindow = Nodelist.list["oActionPointListWindow"]
 onready var oUndoStates = Nodelist.list["oUndoStates"]
+onready var oSortCreatureStats = Nodelist.list["oSortCreatureStats"]
 
 var recentlyOpened = []
 var recentlyOpenedPopupMenu = PopupMenu.new()
@@ -290,6 +291,8 @@ func _on_ViewSubmenu_Pressed(pressedID):
 			Utils.popup_centered(oActionPointListWindow)
 		5:
 			Utils.popup_centered(oGridDataWindow)
+		6:
+			Utils.popup_centered(oSortCreatureStats)
 #		4:
 #			if oEditor.currentView == oEditor.VIEW_2D:
 #				oEditor.set_view_3d()