Skip to content

Commit 9baf9d2

Browse files
committed
update cfgloader when exporting or deleting slabset filepath
1 parent 23c9124 commit 9baf9d2

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

Scenes/Main.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -3103,7 +3103,7 @@ margin_bottom = 409.0
31033103
rect_min_size = Vector2( 300, 105 )
31043104
popup_exclusive = true
31053105
window_title = "Revert Slabset and delete file"
3106-
dialog_text = "Revert all slabs to default and delete map00001.slabset.toml file?"
3106+
dialog_text = "<adjusted in code>"
31073107
dialog_autowrap = true
31083108
script = ExtResource( 61 )
31093109

Scenes/SlabsetWindow.gd

+23-3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ onready var oExportSlabsToml = Nodelist.list["oExportSlabsToml"]
4040
onready var oSlabRevertButton = Nodelist.list["oSlabRevertButton"]
4141
onready var oVarRevertButton = Nodelist.list["oVarRevertButton"]
4242
onready var oSlabsetDeleteButton = Nodelist.list["oSlabsetDeleteButton"]
43+
onready var oConfirmDeleteSlabsetFile = Nodelist.list["oConfirmDeleteSlabsetFile"]
44+
onready var oCfgLoader = Nodelist.list["oCfgLoader"]
4345

4446
enum {
4547
ONE_VARIATION,
@@ -309,9 +311,17 @@ func _on_ExportColumnsToml_pressed():
309311

310312
func _on_ExportSlabsetTomlDialog_file_selected(filePath):
311313
Slabset.export_toml_slabset(filePath)
312-
for i in 100:
314+
315+
for i in 50:
313316
yield(get_tree(),'idle_frame')
314-
update_slabset_delete_button_state()
317+
318+
var dir = Directory.new()
319+
if dir.file_exists(filePath):
320+
update_slabset_delete_button_state()
321+
322+
if oCfgLoader.paths_loaded[oCfgLoader.LOAD_CFG_CURRENT_MAP].has(filePath) == false:
323+
oCfgLoader.paths_loaded[oCfgLoader.LOAD_CFG_CURRENT_MAP].append(filePath)
324+
oSlabsetPathsLabel.start()
315325

316326
func _on_ExportColumnsetTomlDialog_file_selected(filePath):
317327
Columnset.export_toml_columnset(filePath)
@@ -840,11 +850,17 @@ func _on_VarButtonsApplyToAllCheckBox_toggled(button_pressed):
840850
oMessage.quick("Copy and paste buttons will affect 1 variation")
841851

842852

843-
onready var oConfirmDeleteSlabsetFile = Nodelist.list["oConfirmDeleteSlabsetFile"]
844853

845854
func _on_SlabsetDeleteButton_pressed():
855+
oConfirmDeleteSlabsetFile.dialog_text = "Revert all slabs to default and delete this file?\n"
856+
857+
var mapName = oCurrentMap.path.get_file().get_basename()
858+
var slabsetFilePath = oCurrentMap.path.get_base_dir().plus_file(mapName + ".slabset.toml")
859+
oConfirmDeleteSlabsetFile.dialog_text += slabsetFilePath
860+
oConfirmDeleteSlabsetFile.rect_min_size.x = 800
846861
Utils.popup_centered(oConfirmDeleteSlabsetFile)
847862

863+
848864
func _on_ConfirmDeleteSlabsetFile_confirmed():
849865
var mapName = oCurrentMap.path.get_file().get_basename()
850866
var slabsetFilePath = oCurrentMap.path.get_base_dir().plus_file(mapName + ".slabset.toml")
@@ -863,6 +879,10 @@ func _on_ConfirmDeleteSlabsetFile_confirmed():
863879
variations_to_revert.append((slabID * 28) + i)
864880
revert(variations_to_revert)
865881

882+
# Remove from the little box thing of currently loaded files
883+
oCfgLoader.paths_loaded[oCfgLoader.LOAD_CFG_CURRENT_MAP].erase(slabsetFilePath)
884+
oSlabsetPathsLabel.start()
885+
866886
# Update the UI
867887
update_column_spinboxes()
868888
update_objects_ui()

0 commit comments

Comments
 (0)