Merge pull request #39 from snipercup/update-terraintile-editor

Add the rest of the terrain tiles

Scenes/ContentManager/Custom_Editors/Scripts/TerrainTileEditor.gd

@@ -19,6 +19,7 @@ extends Control
 # The content editor has connected this signal to Gamedata already
 signal data_changed()
 
+var control_elements: Array = []
 # The data that represents this tile
 # The data is selected from the Gamedata.data.tiles.data array
 # based on the ID that the user has selected in the content editor
@@ -28,6 +29,30 @@ var contentData: Dictionary = {}:
 		load_tile_data()
 		tileSelector.sprites_collection = Gamedata.data.tiles.sprites
 
+
+func _ready():
+	control_elements = [
+		tileImageDisplay,
+		NameTextEdit,
+		DescriptionTextEdit,
+		CategoriesList,
+		cubeShapeCheckbox,
+		slopeShapeCheckbox
+	]
+
+func _input(event):
+	if event.is_action_pressed("ui_focus_next"):
+		for myControl in control_elements:
+			if myControl.has_focus():
+				if Input.is_key_pressed(KEY_SHIFT):  # Check if Shift key
+					if !myControl.focus_previous.is_empty():
+						myControl.get_node(myControl.focus_previous).grab_focus()
+				else:
+					if !myControl.focus_next.is_empty():
+						myControl.get_node(myControl.focus_next).grab_focus()
+				break
+		get_viewport().set_input_as_handled()
+
 # This function updates the form based on the contentData that has been loaded
 func load_tile_data():
 	if tileImageDisplay != null and contentData.has("sprite"):
@@ -54,7 +79,7 @@ func load_tile_data():
 #TODO: Check for unsaved changes
 func _on_close_button_button_up():
 	queue_free()
-
+	
 # This function takes all data fro the form elements stores them in the contentData
 # Since contentData is a reference to an item in Gamedata.data.tiles.data
 # the central array for tiledata is updated with the changes as well

Scenes/ContentManager/Custom_Editors/TerrainTileEditor.tscn

@@ -56,6 +56,7 @@ custom_minimum_size = Vector2(128, 128)
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_stretch_ratio = 0.4
+tooltip_text = "Select a sprite that will be used to visualize this terrain. You can add sprites by putting the image in /mods/core/Tiles."
 texture = ExtResource("2_x7b0a")
 expand_mode = 3
 
@@ -85,6 +86,7 @@ custom_minimum_size = Vector2(0, 30)
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_stretch_ratio = 0.1
+tooltip_text = "Give a descriptive name that best describes this terrain"
 focus_next = NodePath("../DescriptionTextEdit")
 focus_previous = NodePath("../TileImageDisplay")
 
@@ -97,6 +99,7 @@ layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 size_flags_stretch_ratio = 0.9
+tooltip_text = "This description helps users understand how this terrain is used"
 focus_next = NodePath("../Editable_Item_List")
 focus_previous = NodePath("../NameTextEdit")
 
@@ -108,6 +111,7 @@ text = "Categories:"
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
+tooltip_text = "Categories used in the map editor to separate this terrain from terrain in other categories. For example Floor and Urban"
 header = "Categories"
 
 [node name="ShapeLabel" type="Label" parent="VBoxContainer/FormGrid"]
@@ -119,11 +123,13 @@ layout_mode = 2
 
 [node name="CubeShapeCheckBox" type="CheckBox" parent="VBoxContainer/FormGrid/ShapeButtonContainer"]
 layout_mode = 2
+tooltip_text = "Select this if this terrain is represented by a cube. This allows for it to be either a wall or a floor. This is the default value"
 button_pressed = true
 text = "Cube"
 
 [node name="SlopeShapeCheckBox" type="CheckBox" parent="VBoxContainer/FormGrid/ShapeButtonContainer"]
 layout_mode = 2
+tooltip_text = "Select this if this terrain should be represented by a slope. Tipically ised for stairs or ramps. The player can go one level up if approached from the right angle."
 text = "Slope"
 
 [node name="Sprite_selector" parent="." instance=ExtResource("5_5ngda")]