Pomoce w menu

Author: KoBeWi

Nodes/UI/Key.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Graphics/UI/Keys/Normal.png" type="Texture" id=1]
-[ext_resource path="res://Resources/UI/BoldFont.tres" type="DynamicFont" id=2]
+[ext_resource path="res://Resources/UI/DejaVuSerif.ttf" type="DynamicFontData" id=2]
 [ext_resource path="res://Resources/UI/BiggerFont.tres" type="DynamicFont" id=3]
 
 [sub_resource type="GDScript" id=1]
@@ -13,21 +13,29 @@ export var action = \"\"
 export var function = \"\"
 
 func _ready():
-	var key = KEY_SPACE
+	var key = Com.controls.mappping[Com.controls.NAMES.find(action)]
 	texture = TEXTURES[KeyList.keys[key].type]
 	get_child(0).text = KeyList.keys[key].name
-	get_child(1).text = function"
+	get_child(1).text = function
+
+func set_text(text):
+	get_child(1).text = text"
+
+[sub_resource type="DynamicFont" id=2]
+size = 10
+font_data = ExtResource( 2 )
 
 [node name="Key" type="TextureRect"]
-margin_right = 100.0
-margin_bottom = 100.0
+margin_right = 80.0
+margin_bottom = 80.0
 texture = ExtResource( 1 )
+expand = true
 script = SubResource( 1 )
 
 [node name="Name" type="Label" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
-custom_fonts/font = ExtResource( 2 )
+custom_fonts/font = SubResource( 2 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "ESC"
 align = 1

Nodes/UI/PlayerMenu.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=17 format=2]
 
 [ext_resource path="res://Resources/UI/Standard.tres" type="Theme" id=1]
 [ext_resource path="res://Scripts/UI/PlayerMenu/PlayerMenu.gd" type="Script" id=2]
@@ -15,6 +15,7 @@
 [ext_resource path="res://Nodes/UI/SoulSlot.tscn" type="PackedScene" id=13]
 [ext_resource path="res://Nodes/UI/SoulItem.tscn" type="PackedScene" id=14]
 [ext_resource path="res://Graphics/UI/SoulSelect.png" type="Texture" id=15]
+[ext_resource path="res://Nodes/UI/Key.tscn" type="PackedScene" id=16]
 
 [node name="PlayerMenu" type="Panel"]
 margin_right = 736.0
@@ -250,7 +251,6 @@ margin_bottom = 131.0
 rect_min_size = Vector2( 0, 16 )
 
 [node name="Tabs" type="Control" parent="Container"]
-editor/display_folded = true
 margin_top = 131.0
 margin_right = 736.0
 margin_bottom = 131.0
@@ -848,6 +848,7 @@ custom_fonts/font = ExtResource( 8 )
 text = "hello this is description"
 
 [node name="Souls" type="VBoxContainer" parent="Container/Tabs"]
+editor/display_folded = true
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 4.0
@@ -1244,8 +1245,67 @@ patch_margin_right = 4
 patch_margin_bottom = 4
 
 [node name="Help" type="Control" parent="."]
-margin_right = 40.0
-margin_bottom = 40.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+
+[node name="ChangeTab" parent="Help" instance=ExtResource( 16 )]
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+margin_left = -716.131
+margin_top = -132.878
+margin_right = -636.131
+margin_bottom = -52.8775
+action = "MAP"
+
+[node name="Close" parent="Help" instance=ExtResource( 16 )]
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+margin_left = 24.1001
+margin_top = 83.3499
+margin_right = 104.1
+margin_bottom = 163.35
+action = "MENU"
+function = "Close"
+
+[node name="Select" parent="Help" instance=ExtResource( 16 )]
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+margin_left = 24.1
+margin_top = 1.64996
+margin_right = 104.1
+margin_bottom = 81.65
+action = "ACCEPT"
+function = "Select"
+
+[node name="Cancel" parent="Help" instance=ExtResource( 16 )]
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+margin_left = 210.3
+margin_top = 1.64999
+margin_right = 290.3
+margin_bottom = 81.65
+action = "CANCEL"
+function = "Cancel"
+
+[node name="Unequip" parent="Help" instance=ExtResource( 16 )]
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+margin_left = 212.2
+margin_top = 83.3499
+margin_right = 292.2
+margin_bottom = 163.35
+action = "SOUL"
+function = "Unequip"
 
 [editable path="Container/Tabs/Souls/Slots/Active"]
 

Resources/UI/DefaultFont.tres

@@ -5,4 +5,3 @@
 [resource]
 size = 14
 font_data = ExtResource( 1 )
-

Resources/UI/SmallFont.tres

@@ -5,4 +5,3 @@
 [resource]
 size = 12
 font_data = ExtResource( 1 )
-

Scenes/Title.tscn

@@ -26,16 +26,19 @@ func _ready():
 	Network.connect(\"game_over\", self, \"on_game_over\")
 
 	Com.controls.set_process(true)
+	Com.controls.connect(\"key_press\", self, \"on_key_press\")
+	Com.controls.state = Controls.State.MENU
+	
 	self.select = 0
 
-func _input(event):
+func on_key_press(p_id, key, _state):
 	if state == MAIN:
-		if Input.is_action_just_pressed(\"ui_down\") and select < max_select:
+		if key == Controls.DOWN and select < max_select:
 			self.select += 1
-		elif Input.is_action_just_pressed(\"ui_up\") and select > 0:
+		elif key == Controls.UP and select > 0:
 			self.select -= 1
 
-	if Input.is_action_just_pressed(\"ui_accept\"):
+	if key == Controls.ACCEPT:
 		match state:
 			MAIN:
 				match select:
@@ -72,7 +75,7 @@ func _input(event):
 					2:
 						Packet.new(Packet.TYPE.REGISTER).add_string($Menu/Register/LoginInput.text).add_string($Menu/Register/PasswordInput.text).add_u16($Menu/Register/Hue.value).send()
 						$Menu/Preview.visible = false
-	elif Input.is_action_just_pressed(\"ui_cancel\"):
+	elif key == Controls.CANCEL:
 		match state:
 			LOGIN:
 				match select:
@@ -97,7 +100,8 @@ func _input(event):
 						self.select = 1
 						$Menu/Register/PasswordInput.grab_focus()
 						$Menu/Register/PasswordInput.select_all()
-	
+
+func _input(event):
 	if event is InputEventKey:
 		if event.pressed and event.scancode == KEY_F1:
 			Packet.new(Packet.TYPE.LOGIN).add_string(\"KoBeWi\").add_string(\"vEryHaRdAnDlOnGpAsSwOrD\").send()

Scripts/KeySuperlist.gd

@@ -7,7 +7,8 @@ const keys = {
 	KEY_TAB: {name = "TAB", type = WIDE},
 	KEY_BACKTAB: {name = "BACKTAB", type = WIDE},
 	KEY_BACKSPACE: {name = "BACKSPACE", type = WIDE},
-	KEY_ENTER: {name = "ENTER", type = CURVY},
+	KEY_ENTER: {name = "", type = CURVY},
+#	KEY_ENTER: {name = "ENTER", type = CURVY},
 	KEY_KP_ENTER: {name = "ENTER", type = TALL},
 	KEY_INSERT: {name = "INSERT", type = NORMAL},
 	KEY_DELETE: {name = "DELETE", type = NORMAL},
@@ -24,7 +25,7 @@ const keys = {
 	KEY_PAGEUP: {name = "PAGEUP", type = NORMAL},
 	KEY_PAGEDOWN: {name = "PAGEDOWN", type = NORMAL},
 	KEY_SHIFT: {name = "SHIFT", type = WIDE},
-	KEY_CONTROL: {name = "CONTROL", type = NORMAL},
+	KEY_CONTROL: {name = "CTRL", type = NORMAL},
 	KEY_META: {name = "META", type = NORMAL},
 	KEY_ALT: {name = "ALT", type = NORMAL},
 	KEY_CAPSLOCK: {name = "CAPSLOCK", type = WIDE},

Scripts/System/Controls.gd

@@ -2,6 +2,7 @@ class_name Controls
 extends Node
 
 enum{ATTACK, JUMP, UP, RIGHT, DOWN, LEFT, SOUL, ACCEPT, CANCEL, MAP, MENU, CHAT, COMMAND, CLOSE_CHAT}
+const NAMES = ["ATTACK", "JUMP", "UP", "RIGHT", "DOWN", "LEFT", "SOUL", "ACCEPT", "CANCEL", "MAP", "MENU", "CHAT", "COMMAND", "CLOSE_CHAT"]
 
 enum State{NONE, ACTION, CHAT, MENU, MAP, GAME_OVER}
 var state = State.NONE

Scripts/UI/PlayerMenu/Equipment.gd

@@ -44,9 +44,10 @@ func update_equipment_inventory(items = null):
 	select_inventory()
 
 func select():
+	slot_help()
 	var selected = slots.get_child(select)
 	for slot in slots.get_children():
-		slot.select(selected, inventory_select == -1)
+		slot.select(selected, !is_slot_selected())
 
 	if selected.empty():
 		description.visible = false
@@ -61,6 +62,7 @@ func select():
 
 func select_inventory():
 	if inventory_select > -1:
+		inventory_help()
 		var selected = inventory.get_child(inventory_select)
 		for slot in inventory.get_children():
 			slot.select(selected)
@@ -99,9 +101,12 @@ func get_filter():
 			return ["cape"]
 		7, 8:
 			return ["accessory"]
-			
+
+func is_slot_selected():
+	return inventory_select != -1
+
 func on_press_key(key):
-	if inventory_select == -1:
+	if !is_slot_selected():
 		var old_select = select
 		if key == Controls.RIGHT:
 			select = min(select + 1, slots.get_child_count()-1)
@@ -160,4 +165,23 @@ func unequip_item():
 		select()
 
 func preview_stats(item):
-	main.preview_stats(item, slots.get_child(select).item_name)
+	main.preview_stats(item, slots.get_child(select).item_name)
+
+func _notification(what):
+	if what == NOTIFICATION_VISIBILITY_CHANGED and visible:
+		if is_slot_selected():
+			inventory_help()
+		else:
+			slot_help()
+
+func inventory_help():
+	main.get_help("Select").visible = true
+	main.get_help("Select").set_text("Equip")
+	main.get_help("Unequip").visible = false
+	main.get_help("Cancel").visible = true
+
+func slot_help():
+	main.get_help("Select").visible = true
+	main.get_help("Select").set_text("Select")
+	main.get_help("Unequip").visible = true
+	main.get_help("Cancel").visible = false

Scripts/UI/PlayerMenu/Inventory.gd

@@ -59,4 +59,10 @@ func on_press_key(key):
 		select = max(select - slots.columns, 0)
 
 	if select != old_select:
-		select()
+		select()
+
+func _notification(what):
+	if what == NOTIFICATION_VISIBILITY_CHANGED and visible:
+		main.get_help("Select").visible = false
+		main.get_help("Unequip").visible = false
+		main.get_help("Cancel").visible = false

Scripts/UI/PlayerMenu/PlayerMenu.gd

@@ -90,4 +90,7 @@ func preview_stats(item, item2):
 				set_main_stat(stat, newest_stats[stat] + data[stat] - data2.get(stat, 0) if item2 else newest_stats[stat] + data[stat], true)
 	else:
 		for stat in MAIN_STAT_LIST:
-			set_main_stat(stat, newest_stats[stat])
+			set_main_stat(stat, newest_stats[stat])
+
+func get_help(help):
+	return $Help.get_node(help)

Scripts/UI/PlayerMenu/Souls.gd

@@ -77,8 +77,10 @@ func _notification(what):
 		if visible:
 			select_rect.visible = true
 			if inventory_mode:
+				inventory_help()
 				select_inventory()
 			else:
+				slot_help()
 				select()
 		else:
 			select_rect.visible = false
@@ -106,6 +108,7 @@ func select_inventory():
 		description.visible = false
 
 func inventory_mode():
+	inventory_help()
 	$Slots.visible = false
 	$Inventory.visible = true
 
@@ -118,11 +121,24 @@ func inventory_mode():
 	call_deferred("update_inventory")
 
 func slot_mode():
+	slot_help()
 	$Slots.visible = true
 	$Inventory.visible = false
 	inventory_mode = false
 	select()
 
+func inventory_help():
+	main.get_help("Select").visible = true
+	main.get_help("Select").set_text("Equip")
+	main.get_help("Unequip").visible = false
+	main.get_help("Cancel").visible = true
+
+func slot_help():
+	main.get_help("Select").visible = true
+	main.get_help("Select").set_text("Select")
+	main.get_help("Unequip").visible = true
+	main.get_help("Cancel").visible = false
+
 func sync_souls(data):
 	souls = data
 

Scripts/UI/PlayerMenu/Stats.gd

@@ -1,9 +1,14 @@
 extends HBoxContainer
 
+export(NodePath) var main = @"../../.."
+
 onready var stat_list = $Grid
 
 var level = 1
 
+func _ready():
+	main = get_node(main)
+
 func update_stats(stats):
 	if "level" in stats:
 		level = stats.level
@@ -13,4 +18,10 @@ func update_stats(stats):
 		stat_list.get_node("NEXTValue").text = str(Com.exp_for_level(level) - stats.exp + Com.total_exp_for_level(level-1))
 
 func on_press_key(key):
-	pass
+	pass
+
+func _notification(what):
+	if what == NOTIFICATION_VISIBILITY_CHANGED and visible:
+		main.get_help("Select").visible = false
+		main.get_help("Unequip").visible = false
+		main.get_help("Cancel").visible = false

TODO.txt

@@ -1,6 +1,6 @@
 -błąd +dodatek >zmiana
 
-+pomoc w menu gracza
++pomoc do mapy i menu (że można otworzyć je)
 +info o klawiszach, gdy gracz wchodzi
 +puszczanie klaiwszy po zmianie stanu sterowania (np. idzie grazc i mapa)
 +kucanie