diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn index a2a276b1..7844f295 100644 --- a/Scenes/Main.tscn +++ b/Scenes/Main.tscn @@ -3935,6 +3935,7 @@ margin_right = 302.0 margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 text = "Map name" @@ -3956,6 +3957,7 @@ margin_right = 302.0 margin_bottom = 62.0 grow_horizontal = 0 grow_vertical = 0 +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 text = "Tileset" @@ -3974,6 +3976,7 @@ align = 1 margin_top = 69.0 margin_right = 302.0 margin_bottom = 90.0 +mouse_filter = 1 text = "Map file format" [node name="CurrentFormat" type="OptionButton" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/PanelContainer2/GridContainer"] @@ -3991,6 +3994,8 @@ selected = 0 margin_top = 106.0 margin_right = 302.0 margin_bottom = 127.0 +hint_tooltip = "MAPSIZE" +mouse_filter = 1 text = "Map size" [node name="PanelContainer" type="PanelContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/PanelContainer2/GridContainer"] @@ -4054,44 +4059,51 @@ rect_min_size = Vector2( 0, 10 ) [node name="AdvancedMapProperties" type="PanelContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer"] margin_top = 172.0 margin_right = 625.0 -margin_bottom = 571.0 +margin_bottom = 543.0 [node name="VBoxContainer" type="VBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties"] margin_left = 9.0 margin_top = 9.0 margin_right = 616.0 -margin_bottom = 390.0 +margin_bottom = 362.0 -[node name="Label" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +[node name="MarginContainer" type="MarginContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] margin_right = 607.0 -margin_bottom = 21.0 +margin_bottom = 31.0 +custom_constants/margin_top = 5 +custom_constants/margin_bottom = 5 + +[node name="Label" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/MarginContainer"] +margin_top = 5.0 +margin_right = 607.0 +margin_bottom = 26.0 text = "Level overview file (.lof)" align = 1 -[node name="Spacing2" type="Control" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] -margin_top = 25.0 +[node name="HSeparator3" type="HSeparator" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 35.0 margin_right = 607.0 -margin_bottom = 35.0 -rect_min_size = Vector2( 0, 10 ) +margin_bottom = 36.0 -[node name="GridContainer" type="GridContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] -margin_top = 39.0 +[node name="HBoxAuthor" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 40.0 margin_right = 607.0 -margin_bottom = 381.0 -columns = 2 +margin_bottom = 71.0 -[node name="Label5" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_right = 302.0 +[node name="Label5" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxAuthor"] +margin_right = 301.0 margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "AUTHOR" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 text = "Author" valign = 1 -[node name="AuthorLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 +[node name="AuthorLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxAuthor"] +margin_left = 305.0 margin_right = 607.0 margin_bottom = 31.0 grow_horizontal = 2 @@ -4099,198 +4111,248 @@ grow_vertical = 2 size_flags_horizontal = 7 align = 1 -[node name="Label2" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 35.0 -margin_right = 302.0 -margin_bottom = 62.0 +[node name="HBoxDescription" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 75.0 +margin_right = 607.0 +margin_bottom = 106.0 + +[node name="Label6" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxDescription"] +margin_right = 301.0 +margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 -hint_tooltip = "KIND" +hint_tooltip = "DESCRIPTION" mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Map type" +text = "Description" valign = 1 -[node name="KindOptionButton" type="OptionButton" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 35.0 +[node name="DescriptionLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxDescription"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 62.0 +margin_bottom = 31.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 7 align = 1 -[node name="Label6" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 66.0 -margin_right = 302.0 -margin_bottom = 97.0 +[node name="HSeparator2" type="HSeparator" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 110.0 +margin_right = 607.0 +margin_bottom = 111.0 + +[node name="HBoxKind" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 115.0 +margin_right = 607.0 +margin_bottom = 142.0 + +[node name="Label2" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxKind"] +margin_right = 301.0 +margin_bottom = 27.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "KIND" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Description" +text = "Map type" valign = 1 -[node name="DescriptionLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 66.0 +[node name="KindOptionButton" type="OptionButton" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxKind"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 97.0 -grow_horizontal = 2 -grow_vertical = 2 -size_flags_horizontal = 7 +margin_bottom = 27.0 +size_flags_horizontal = 3 align = 1 -[node name="KindLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -visible = false -margin_top = 136.0 -margin_right = 311.0 -margin_bottom = 167.0 -grow_horizontal = 2 -grow_vertical = 2 -size_flags_horizontal = 7 +[node name="HSeparator" type="HSeparator" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 146.0 +margin_right = 607.0 +margin_bottom = 147.0 -[node name="Label10" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 101.0 -margin_right = 302.0 -margin_bottom = 132.0 +[node name="HBoxPlayers" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 151.0 +margin_right = 607.0 +margin_bottom = 182.0 + +[node name="Label10" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxPlayers"] +margin_right = 301.0 +margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "PLAYERS" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 text = "Players" valign = 1 -[node name="PlayersLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 101.0 +[node name="PlayersSpinBox" type="SpinBox" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxPlayers"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 132.0 -grow_horizontal = 2 -grow_vertical = 2 -size_flags_horizontal = 7 +margin_bottom = 31.0 +size_flags_horizontal = 3 +min_value = 2.0 +max_value = 4.0 +value = 2.0 align = 1 +script = ExtResource( 81 ) -[node name="Label3" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 136.0 -margin_right = 302.0 -margin_bottom = 167.0 +[node name="HBoxSpeech" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 186.0 +margin_right = 607.0 +margin_bottom = 217.0 + +[node name="Label11" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxSpeech"] +margin_right = 301.0 +margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "SPEECH" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Ensign position" +text = "Speech" valign = 1 -[node name="EnsignPositionLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 136.0 +[node name="SpeechLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxSpeech"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 167.0 +margin_bottom = 31.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 7 align = 1 -[node name="Label9" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 171.0 -margin_right = 302.0 -margin_bottom = 202.0 +[node name="HBoxLandView" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 221.0 +margin_right = 607.0 +margin_bottom = 252.0 + +[node name="Label12" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxLandView"] +margin_right = 301.0 +margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "LAND_VIEW" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Ensign zoom" +text = "Land view" valign = 1 -[node name="EnsignZoomLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 171.0 +[node name="LandViewLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxLandView"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 202.0 +margin_bottom = 31.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 7 align = 1 -[node name="Label4" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 206.0 -margin_right = 302.0 -margin_bottom = 237.0 +[node name="HBoxEnsignPosition" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 256.0 +margin_right = 607.0 +margin_bottom = 287.0 + +[node name="Label3" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxEnsignPosition"] +margin_right = 301.0 +margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "ENSIGN_POS and ENSIGN_ZOOM" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Options" +text = "Flag position" valign = 1 -[node name="OptionsLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 206.0 +[node name="EnsignPositionLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxEnsignPosition"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 237.0 +margin_bottom = 31.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 7 align = 1 -[node name="Label11" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 241.0 -margin_right = 302.0 -margin_bottom = 272.0 +[node name="HBoxEnsignZoom" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +visible = false +margin_top = 291.0 +margin_right = 607.0 +margin_bottom = 322.0 + +[node name="Label9" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxEnsignZoom"] +visible = false +margin_right = 301.0 +margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "ENSIGN_ZOOM" size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Speech" +text = "Ensign zoom" valign = 1 -[node name="SpeechLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 241.0 +[node name="EnsignZoomLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxEnsignZoom"] +visible = false +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 272.0 +margin_bottom = 31.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 7 align = 1 -[node name="Label12" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 276.0 -margin_right = 302.0 -margin_bottom = 307.0 +[node name="HBoxOptions" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 291.0 +margin_right = 607.0 +margin_bottom = 318.0 + +[node name="Label4" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxOptions"] +margin_right = 301.0 +margin_bottom = 27.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "OPTIONS" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Land view" +text = "Flag icon" valign = 1 -[node name="LandViewLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 276.0 +[node name="OptionsOptionButton" type="OptionButton" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxOptions"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 307.0 -grow_horizontal = 2 -grow_vertical = 2 -size_flags_horizontal = 7 +margin_bottom = 27.0 +size_flags_horizontal = 3 +text = "Standard" align = 1 +items = [ "Standard", null, false, 0, null, "Tutorial", null, false, 1, null ] +selected = 0 -[node name="Label8" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_top = 311.0 -margin_right = 302.0 -margin_bottom = 342.0 +[node name="HBoxNameID" type="HBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer"] +margin_top = 322.0 +margin_right = 607.0 +margin_bottom = 353.0 + +[node name="Label8" type="Label" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxNameID"] +margin_right = 301.0 +margin_bottom = 31.0 grow_horizontal = 0 grow_vertical = 0 +hint_tooltip = "NAME_ID" +mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 1 -text = "Name ID" +text = "Translation ID" valign = 1 -[node name="NameIDLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer"] -margin_left = 306.0 -margin_top = 311.0 +[node name="NameIDLineEdit" type="LineEdit" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxNameID"] +margin_left = 305.0 margin_right = 607.0 -margin_bottom = 342.0 +margin_bottom = 31.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 7 @@ -7188,17 +7250,16 @@ script = SubResource( 20 ) [connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/PanelContainer2/GridContainer/MapNameLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_MapNameLineEdit_text_changed"] [connection signal="item_selected" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/PanelContainer2/GridContainer/DungeonStyleList" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_DungeonStyleList_item_selected"] [connection signal="item_selected" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/PanelContainer2/GridContainer/CurrentFormat" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_MapFormatSetting_item_selected"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/AuthorLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_AuthorLineEdit_text_changed"] -[connection signal="item_selected" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/KindOptionButton" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_KindOptionButton_item_selected"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/DescriptionLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_DescriptionLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/KindLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_KindLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/PlayersLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_PlayersLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/EnsignPositionLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_EnsignPositionLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/EnsignZoomLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_EnsignZoomLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/OptionsLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_OptionsLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/SpeechLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_SpeechLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/LandViewLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_LandViewLineEdit_text_changed"] -[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/GridContainer/NameIDLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_NameIDLineEdit_text_changed"] +[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxAuthor/AuthorLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_AuthorLineEdit_text_changed"] +[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxDescription/DescriptionLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_DescriptionLineEdit_text_changed"] +[connection signal="item_selected" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxKind/KindOptionButton" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_KindOptionButton_item_selected"] +[connection signal="value_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxPlayers/PlayersSpinBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_PlayersSpinBox_value_changed"] +[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxSpeech/SpeechLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_SpeechLineEdit_text_changed"] +[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxLandView/LandViewLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_LandViewLineEdit_text_changed"] +[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxEnsignPosition/EnsignPositionLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_EnsignPositionLineEdit_text_changed"] +[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxEnsignZoom/EnsignZoomLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_EnsignZoomLineEdit_text_changed"] +[connection signal="item_selected" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxOptions/OptionsOptionButton" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_OptionsOptionButton_item_selected"] +[connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties/VBoxContainer/AdvancedMapProperties/VBoxContainer/HBoxNameID/NameIDLineEdit" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/MapProperties" method="_on_NameIDLineEdit_text_changed"] [connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/KeeperFXScriptCheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_KeeperFXScriptCheckBox_toggled"] [connection signal="text_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/HBoxContainer/PortalRateField" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_PortalRateField_text_changed"] [connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/BlueAICheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_BlueAICheckBox_toggled"] diff --git a/Scenes/Properties.gd b/Scenes/Properties.gd index a3ad296d..b0f1e357 100644 --- a/Scenes/Properties.gd +++ b/Scenes/Properties.gd @@ -12,26 +12,37 @@ onready var oAdvancedMapProperties = Nodelist.list["oAdvancedMapProperties"] onready var oMapSizeTextLabel = Nodelist.list["oMapSizeTextLabel"] onready var oMapNameLineEdit = Nodelist.list["oMapNameLineEdit"] onready var oNameIDLineEdit = Nodelist.list["oNameIDLineEdit"] -onready var oKindLineEdit = Nodelist.list["oKindLineEdit"] onready var oEnsignPositionLineEdit = Nodelist.list["oEnsignPositionLineEdit"] -onready var oEnsignZoomLineEdit = Nodelist.list["oEnsignZoomLineEdit"] -onready var oPlayersLineEdit = Nodelist.list["oPlayersLineEdit"] -onready var oOptionsLineEdit = Nodelist.list["oOptionsLineEdit"] onready var oSpeechLineEdit = Nodelist.list["oSpeechLineEdit"] onready var oLandViewLineEdit = Nodelist.list["oLandViewLineEdit"] onready var oAuthorLineEdit = Nodelist.list["oAuthorLineEdit"] onready var oDescriptionLineEdit = Nodelist.list["oDescriptionLineEdit"] onready var oCurrentFormat = Nodelist.list["oCurrentFormat"] onready var oKindOptionButton = Nodelist.list["oKindOptionButton"] +onready var oPlayersSpinBox = Nodelist.list["oPlayersSpinBox"] +onready var oOptionsOptionButton = Nodelist.list["oOptionsOptionButton"] + +onready var oHBoxPlayers = Nodelist.list["oHBoxPlayers"] +onready var oHBoxSpeech = Nodelist.list["oHBoxSpeech"] +onready var oHBoxEnsignPosition = Nodelist.list["oHBoxEnsignPosition"] +onready var oHBoxOptions = Nodelist.list["oHBoxOptions"] +onready var oHBoxLandView = Nodelist.list["oHBoxLandView"] +onready var oHBoxNameID = Nodelist.list["oHBoxNameID"] const kind_options = { "Solo" : "FREE", - "Campaign" : "SINGLE", "Multiplayer" : "MULTI", + "Campaign" : "SINGLE", "Secret" : "BONUS", "Moon" : "EXTRA", } +const options_options = { + "Standard" : "", + "Tutorial" : "TUTORIAL", +} + + func _ready(): var tooltip_text = "" for key in kind_options.keys(): @@ -41,11 +52,11 @@ func _ready(): # Default to hiding ONCE, when you start the editor. oAdvancedMapProperties.visible = false - # Construct oKindOptionButton for stringKind in kind_options.keys(): oKindOptionButton.add_item(stringKind) oKindOptionButton.selected = 0 + func _on_MapProperties_visibility_changed(): if is_instance_valid(oDungeonStyleList) == false: return @@ -54,10 +65,9 @@ func _on_MapProperties_visibility_changed(): oMapNameLineEdit.text = oDataMapName.data oNameIDLineEdit.text = oDataLof.NAME_ID oKindOptionButton.selected = kind_text_to_button_id() + oOptionsOptionButton.selected = options_text_to_button_id() oEnsignPositionLineEdit.text = oDataLof.ENSIGN_POS - oEnsignZoomLineEdit.text = oDataLof.ENSIGN_ZOOM - oPlayersLineEdit.text = oDataLof.PLAYERS - oOptionsLineEdit.text = oDataLof.OPTIONS + oPlayersSpinBox.value = int(oDataLof.PLAYERS) oSpeechLineEdit.text = oDataLof.SPEECH oLandViewLineEdit.text = oDataLof.LAND_VIEW oAuthorLineEdit.text = oDataLof.AUTHOR @@ -72,6 +82,8 @@ func _on_MapProperties_visibility_changed(): oCurrentFormat.disabled = false set_format_selection(oCurrentFormat.selected) + + update_section_visibility() func _on_MapFormatSetting_item_selected(index): # Clicked using mouse @@ -104,28 +116,6 @@ func refresh_dungeon_style_options(): if oDataLevelStyle.data <= oTextureCache.cachedTextures.size(): oDungeonStyleList.selected = oDataLevelStyle.data -# for i in oDungeonStyleList.get_children(): -# i.queue_free() -# -# for i in oTextureCache.cachedTextures.size(): -# var aaa = CheckBox.new() -# aaa.align = Button.ALIGN_LEFT -# if i == oDataLevelStyle.data: -# aaa.pressed = true -# aaa.group = load("res://Theme/ButtonGroupDungeonStyle.tres") -# if Constants.TEXTURE_MAP_NAMES.has(i) == true: -# aaa.text = Constants.TEXTURE_MAP_NAMES[i] -# else: -# aaa.text = "Untitled" -# aaa.size_flags_vertical = Control.SIZE_EXPAND# + Control.SIZE_SHRINK_CENTER -# aaa.size_flags_horizontal = Control.SIZE_EXPAND# + Control.SIZE_SHRINK_CENTER -# aaa.connect("pressed",self,"_on_DungeonStyleButtonPressed",[i]) -# oDungeonStyleList.add_child(aaa) -# -# var bbb = Label.new() -# bbb.text = "tmapa" + str(i).pad_zeros(3) + ".dat" -# oDungeonStyleList.add_child(bbb) - func _on_DungeonStyleList_item_selected(value): oEditor.mapHasBeenEdited = true oDataLevelStyle.data = value @@ -148,12 +138,8 @@ func _on_NameIDLineEdit_text_changed(new_text): func _on_EnsignPositionLineEdit_text_changed(new_text): oEditor.mapHasBeenEdited = true oDataLof.ENSIGN_POS = new_text -func _on_EnsignZoomLineEdit_text_changed(new_text): - oEditor.mapHasBeenEdited = true oDataLof.ENSIGN_ZOOM = new_text -func _on_PlayersLineEdit_text_changed(new_text): - oEditor.mapHasBeenEdited = true - oDataLof.PLAYERS = new_text + func _on_OptionsLineEdit_text_changed(new_text): oEditor.mapHasBeenEdited = true oDataLof.OPTIONS = new_text @@ -164,26 +150,88 @@ func _on_LandViewLineEdit_text_changed(new_text): oEditor.mapHasBeenEdited = true oDataLof.LAND_VIEW = new_text +func _on_PlayersSpinBox_value_changed(value): + oEditor.mapHasBeenEdited = true + oDataLof.PLAYERS = str(value) -#func _on_KindLineEdit_text_changed(new_text): -# oEditor.mapHasBeenEdited = true -# oDataLof.KIND = new_text func _on_KindOptionButton_item_selected(index): + oEditor.mapHasBeenEdited = true oDataLof.KIND = kind_options[oKindOptionButton.text] + update_section_visibility() + + +func _on_OptionsOptionButton_item_selected(index): oEditor.mapHasBeenEdited = true + oDataLof.OPTIONS = options_options[oOptionsOptionButton.text] -func kind_text_to_button_id(): - var kind_value = oDataLof.KIND - var button_id = -1 - for i in range(oKindOptionButton.get_item_count()): - if kind_options[oKindOptionButton.get_item_text(i)] == kind_value: +func options_text_to_button_id(): + var button_id = 0 + for i in range(oOptionsOptionButton.get_item_count()): + if options_options[oOptionsOptionButton.get_item_text(i)] == oDataLof.OPTIONS: button_id = i break + return button_id - if button_id == -1: - button_id = 0 # Default to 0 or another suitable default index - +func kind_text_to_button_id(): + var button_id = 0 + for i in range(oKindOptionButton.get_item_count()): + if kind_options[oKindOptionButton.get_item_text(i)] == oDataLof.KIND: + button_id = i + break return button_id + +func update_section_visibility(): + oHBoxPlayers.visible = false + oHBoxSpeech.visible = false + oHBoxEnsignPosition.visible = false + #oHBoxEnsignZoom.visible = false + oHBoxOptions.visible = false + oHBoxLandView.visible = false + oHBoxNameID.visible = false + match oKindOptionButton.get_item_text(oKindOptionButton.selected): + "Solo": + pass + "Multiplayer": + oHBoxPlayers.visible = true + + oHBoxEnsignPosition.visible = true + #oHBoxEnsignZoom.visible = true + oHBoxOptions.visible = true + oHBoxLandView.visible = true + oHBoxNameID.visible = true + "Campaign", "Secret", "Moon": + oHBoxSpeech.visible = true + + oHBoxEnsignPosition.visible = true + #oHBoxEnsignZoom.visible = true + oHBoxOptions.visible = true + oHBoxLandView.visible = true + oHBoxNameID.visible = true + + if oHBoxPlayers.visible == false: + oPlayersSpinBox.value = 2 + oDataLof.PLAYERS = "" + + if oHBoxSpeech.visible == false: + oSpeechLineEdit.text = "" + oDataLof.SPEECH = "" + + if oHBoxEnsignPosition.visible == false: + oEnsignPositionLineEdit.text = "" + oDataLof.ENSIGN_POS = "" + oDataLof.ENSIGN_ZOOM = "" + + if oHBoxOptions.visible == false: + oOptionsOptionButton.selected = 0 + oDataLof.OPTIONS = "" + + if oHBoxLandView.visible == false: + oLandViewLineEdit.text = "" + oDataLof.LAND_VIEW = "" + + if oHBoxNameID.visible == false: + oNameIDLineEdit.text = "" + oDataLof.NAME_ID = "" diff --git a/dk_images/landviews/rgmap00.png b/dk_images/landviews/rgmap00.png new file mode 100644 index 00000000..321faa3b Binary files /dev/null and b/dk_images/landviews/rgmap00.png differ diff --git a/dk_images/landviews/rgmap00.png.import b/dk_images/landviews/rgmap00.png.import new file mode 100644 index 00000000..1464e555 --- /dev/null +++ b/dk_images/landviews/rgmap00.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/rgmap00.png-f451107a4f166f0d9655b4f772884fab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://dk_images/landviews/rgmap00.png" +dest_files=[ "res://.import/rgmap00.png-f451107a4f166f0d9655b4f772884fab.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0