Updated the ui.

game/player/Body.gd

@@ -499,7 +499,7 @@ func on_c_controlled_changed():
 			
 		set_process_input(false)
 		set_process_unhandled_input(false)
-		var nameplatescn : PackedScene = ResourceLoader.load("res://ui/nameplates/NamePlate.tscn")
+		var nameplatescn : PackedScene = ResourceLoader.load("res://ui/2d/world/nameplates/NamePlate.tscn")
 		_nameplate = nameplatescn.instance()
 		get_parent().add_child(_nameplate)
 		

game/project.godot

@@ -355,7 +355,7 @@ config/version="0.2"
 
 Server="*res://autoload/Server.tscn"
 ThemeAtlas="*res://ui/autoload/ThemeAtlas.tscn"
-WorldNumbers="*res://ui/world_numbers_2d/WorldNumbers.tscn"
+WorldNumbers="*res://ui/2d/world/world_numbers_2d/WorldNumbers.tscn"
 CursorManager="*res://cursors/autoload/CursorManager.tscn"
 Settings="*res://ui/autoload/SettingsManager.tscn"
 Logger="*res://autoload/Logger.tscn"
@@ -511,6 +511,311 @@ sheath={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":80,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
+move_forward={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+move_backward={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+move_left={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+move_right={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+actionbar_2_0={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_1={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_2={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_3={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_4={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_5={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_6={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_7={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_8={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_9={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_10={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_11={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_2_12={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_0={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_1={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_2={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_3={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_4={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_5={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_6={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_7={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_8={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_9={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_10={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_11={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_3_12={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_0={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_1={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_2={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_3={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_4={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_5={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_6={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_7={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_8={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_9={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_10={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_11={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_4_12={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_0={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_1={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_2={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_3={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_4={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_5={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_6={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_7={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_8={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_9={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_10={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_11={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_5_12={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_0={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_1={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_2={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_3={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_4={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_5={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_6={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_7={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_8={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_9={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_10={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_11={
+"deadzone": 0.5,
+"events": [  ]
+}
+actionbar_6_12={
+"deadzone": 0.5,
+"events": [  ]
+}
+jump={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_prev_page={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777244,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_next_page={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_prev_page_2={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777254,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_next_page_2={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777255,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [layer_names]
 
@@ -554,3 +859,8 @@ quality/reflections/atlas_size=0
 quality/depth/hdr=false
 quality/2d/use_batching=true
 quality/shadows/enabled=false
+
+[ui]
+
+actionbar/show_keybind_text=true
+actionbar/show_cooldown_text=true

game/scenes/Menu.tscn

@@ -1,22 +1,22 @@
 [gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/menu/CharacterEntry.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/menu/CharacterEntry.tscn" type="PackedScene" id=2]
 [ext_resource path="res://scenes/Menu.gd" type="Script" id=3]
-[ext_resource path="res://ui/menu/menu_character_button_group.tres" type="ButtonGroup" id=4]
+[ext_resource path="res://ui/player/menu/menu_character_button_group.tres" type="ButtonGroup" id=4]
 [ext_resource path="res://scenes/CharacterSelectorMenu.gd" type="Script" id=5]
 [ext_resource path="res://scenes/CharacterCreationMenu.gd" type="Script" id=6]
-[ext_resource path="res://ui/menu/character_creation_button_group.tres" type="ButtonGroup" id=7]
-[ext_resource path="res://ui/options/Options.tscn" type="PackedScene" id=8]
-[ext_resource path="res://ui/register/Register.tscn" type="PackedScene" id=9]
-[ext_resource path="res://ui/login/Login.tscn" type="PackedScene" id=10]
+[ext_resource path="res://ui/player/menu/character_creation_button_group.tres" type="ButtonGroup" id=7]
+[ext_resource path="res://ui/windows/options/Options.tscn" type="PackedScene" id=8]
+[ext_resource path="res://ui/menu/register/Register.tscn" type="PackedScene" id=9]
+[ext_resource path="res://ui/menu/login/Login.tscn" type="PackedScene" id=10]
 [ext_resource path="res://scenes/ConnectButton.gd" type="Script" id=11]
 [ext_resource path="res://scenes/HostButton.gd" type="Script" id=12]
 [ext_resource path="res://scenes/DisconnectButton.gd" type="Script" id=13]
 [ext_resource path="res://scenes/ConnectServerButton.gd" type="Script" id=14]
 [ext_resource path="res://scenes/HostGameButton.gd" type="Script" id=15]
-[ext_resource path="res://menu/ExitButton.gd" type="Script" id=16]
-[ext_resource path="res://ui/about/About.tscn" type="PackedScene" id=20]
+[ext_resource path="res://scenes/menu/ExitButton.gd" type="Script" id=16]
+[ext_resource path="res://ui/windows/about/About.tscn" type="PackedScene" id=20]
 
 [node name="Menu" type="Control"]
 anchor_right = 1.0

game/scripts/game_modules/DataManager.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/DataManager.gd" type="Script" id=1]
-[ext_resource path="res://ui/player_ui/player_ui.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/player_ui/player_ui.tscn" type="PackedScene" id=2]
 
 [node name="DataManager" type="Node"]
 script = ExtResource( 1 )

game/ui/2d/touch_movement_controls/TouchMovementControls.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/touch_pad/analog.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/touch_pad/TurnPanel.gd" type="Script" id=2]
-[ext_resource path="res://ui/touch_pad/analog.gd" type="Script" id=3]
+[ext_resource path="res://ui/2d/touch_pad/analog.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/2d/touch_pad/TurnPanel.gd" type="Script" id=2]
+[ext_resource path="res://ui/2d/touch_pad/analog.gd" type="Script" id=3]
 
 [node name="TouchMovementControls" type="MarginContainer"]
 anchor_right = 1.0

game/ui/2d/touch_movement_controls/game_module.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/touch_movement_controls/TouchMovementControls.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/2d/touch_movement_controls/TouchMovementControls.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )

game/ui/2d/touch_pad/analog.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://ui/touch_pad/analog.gd" type="Script" id=1]
-[ext_resource path="res://ui/touch_pad/big_circle.png" type="Texture" id=2]
-[ext_resource path="res://ui/touch_pad/small_circle.png" type="Texture" id=3]
+[ext_resource path="res://ui/2d/touch_pad/analog.gd" type="Script" id=1]
+[ext_resource path="res://ui/2d/touch_pad/big_circle.png" type="Texture" id=2]
+[ext_resource path="res://ui/2d/touch_pad/small_circle.png" type="Texture" id=3]
 
 [sub_resource type="Animation" id=1]
 length = 5.0

game/ui/2d/touch_pad/big_circle.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/big_circle.png-3e7d1c39c6dde9ffecb18aecfb2a2a19.stex"
+path="res://.import/big_circle.png-46414ca93bcc155a825eb53547a6b7ce.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://ui/touch_pad/big_circle.png"
-dest_files=[ "res://.import/big_circle.png-3e7d1c39c6dde9ffecb18aecfb2a2a19.stex" ]
+source_file="res://ui/2d/touch_pad/big_circle.png"
+dest_files=[ "res://.import/big_circle.png-46414ca93bcc155a825eb53547a6b7ce.stex" ]
 
 [params]
 

game/ui/2d/touch_pad/small_circle.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/small_circle.png-035ef8e6fee54222401287369836bd6a.stex"
+path="res://.import/small_circle.png-ebc16ca003bd7bbabc3f0a34458e6ba7.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://ui/touch_pad/small_circle.png"
-dest_files=[ "res://.import/small_circle.png-035ef8e6fee54222401287369836bd6a.stex" ]
+source_file="res://ui/2d/touch_pad/small_circle.png"
+dest_files=[ "res://.import/small_circle.png-ebc16ca003bd7bbabc3f0a34458e6ba7.stex" ]
 
 [params]
 

game/ui/2d/touch_target_controls/TouchTargetControls.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/touch_pad/analog.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/touch_pad/analog.gd" type="Script" id=2]
+[ext_resource path="res://ui/2d/touch_pad/analog.tscn" type="PackedScene" id=1]
 
 [node name="TouchTargetControls" type="MarginContainer"]
 visible = false
@@ -45,11 +44,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Analog" type="Node2D" parent="HBoxContainer/TargetPad" instance=ExtResource( 1 )]
+[node name="Analog" parent="HBoxContainer/TargetPad" instance=ExtResource( 1 )]
 position = Vector2( 40, 30 )
-script = ExtResource( 2 )
-__meta__ = {
-"__editor_plugin_screen__": "2D"
-}
-isDynamicallyShowing = true
 padname = "TargetPad"

game/ui/2d/touch_target_controls/game_module.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/touch_target_controls/TouchTargetControls.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/2d/touch_target_controls/TouchTargetControls.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )

game/ui/2d/world/nameplates/NamePlate.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/nameplates/name_plate_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/nameplates/texture_progress_fg.tres" type="Texture" id=2]
+[ext_resource path="res://ui/2d/world/nameplates/name_plate_theme.tres" type="Theme" id=1]
+[ext_resource path="res://ui/2d/world/nameplates/texture_progress_fg.tres" type="Texture" id=2]
 [ext_resource path="res://player/NamePlate.gd" type="Script" id=3]
 
 [node name="NamePlate" type="VBoxContainer"]

game/ui/2d/world/nameplates/name_plate_theme.tres

@@ -1,6 +1,4 @@
-[gd_resource type="Theme" load_steps=4 format=2]
-
-[ext_resource path="res://ui/nameplates/name_plate_dynamicfont.tres" type="DynamicFont" id=1]
+[gd_resource type="Theme" load_steps=3 format=2]
 
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0.0627451, 0.0627451, 0.0627451, 0.823529 )
@@ -19,7 +17,6 @@ corner_radius_bottom_left = 5
 anti_aliasing = false
 
 [resource]
-default_font = ExtResource( 1 )
 Label/colors/font_color = Color( 1, 1, 1, 1 )
 Label/colors/font_color_shadow = Color( 0, 0, 0, 0 )
 Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 )

game/ui/2d/world/world_numbers_2d/Number.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://ui/world_numbers_2d/Number.gd" type="Script" id=1]
-[ext_resource path="res://ui/world_numbers_2d/number_font.tres" type="DynamicFont" id=2]
+[ext_resource path="res://ui/2d/world/world_numbers_2d/Number.gd" type="Script" id=1]
+[ext_resource path="res://ui/2d/world/world_numbers_2d/number_font.tres" type="DynamicFont" id=2]
 
 
 [sub_resource type="Animation" id=1]

game/ui/2d/world/world_numbers_2d/WorldNumbers.tscn

@@ -0,0 +1,8 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://ui/2d/world/world_numbers_2d/WorldNumbers.gd" type="Script" id=1]
+[ext_resource path="res://ui/2d/world/world_numbers_2d/Number.tscn" type="PackedScene" id=2]
+
+[node name="WorldNumbers" type="Node"]
+script = ExtResource( 1 )
+number_scene = ExtResource( 2 )

game/ui/autoload/SettingsManager.gd

@@ -1,6 +1,6 @@
 extends Node
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -42,10 +42,14 @@ var _settings : Dictionary = {
 		"use_vsync" : ProjectSettings.get("display/window/vsync/use_vsync"),
 		"vsync_via_compositor" : ProjectSettings.get("display/window/vsync/vsync_via_compositor"),
 	},
+	"game" : {
+	},
 	"ui" : {
 		"touchscreen_mode" : OS.has_touchscreen_ui_hint(),
 		"ui_scale" : ProjectSettings.get("display/window/size/ui_scale"),
 		"ui_scale_touch" : ProjectSettings.get("display/window/size/ui_scale_touch"),
+		"actionbar_show_keybind_text" : ProjectSettings.get("ui/actionbar/show_keybind_text"),
+		"actionbar_show_coldown_text" : ProjectSettings.get("ui/actionbar/show_cooldown_text"),
 	},
 	"debug" : {
 		"debug_info" : false
@@ -183,6 +187,12 @@ func set_ui_ui_scale_touch(value : float) -> void:
 	ProjectSettings.set("rendering/window/size/ui_scale_touch", value)
 	set_stretch()
 
+func set_ui_actionbar_show_keybind_text(value : bool) -> void:
+	ProjectSettings.set("ui/actionbar/show_keybind_text", value)
+	
+func set_ui_actionbar_show_coldown_text(value : bool) -> void:
+	ProjectSettings.set("ui/actionbar/show_cooldown_text", value)
+
 func set_stretch():
 	if !loaded:
 		return

game/ui/autoload/ThemeAtlas.gd

@@ -1,6 +1,6 @@
 extends TextureMerger
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/autoload/WorldNumbers.tscn

@@ -1,8 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://ui/numbers/Number.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/autoload/WorldNumbers.gd" type="Script" id=2]
-
-[node name="WorldNumbers" type="Node"]
-script = ExtResource( 2 )
-number_scene = ExtResource( 1 )

game/ui/debug/DebugInfo.gd

@@ -1,6 +1,6 @@
 extends Label
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/debug/debuginfo_font.tres

@@ -2,6 +2,7 @@
 
 [ext_resource path="res://fonts/VT323-Regular.ttf" type="DynamicFontData" id=1]
 
+
 [resource]
 size = 11
 font_data = ExtResource( 1 )

game/ui/numbers/Number.gd

@@ -1,87 +0,0 @@
-extends Label
-
-# Copyright (c) 2019-2020 Péter Magyar
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-export(NodePath) var animation_player_path : NodePath = "AnimationPlayer"
-
-export(Color) var damage_color : Color = Color.yellow
-export(Color) var heal_color : Color = Color.green
-
-var world_position : Vector3 = Vector3()
-var animation_player : AnimationPlayer = null
-var camera : Camera = null
-
-func _ready() -> void:
-	animation_player = get_node(animation_player_path) as AnimationPlayer
-	
-	animation_player.connect("animation_finished", self, "animation_finished")
-	
-	set_process(false)
-
-func _process(delta):
-	if camera == null:
-		return
-		
-	var cam_pos : Vector3 = camera.global_transform.xform(Vector3())
-	var dstv : Vector3 = cam_pos - world_position
-	dstv.y = 0
-#	var dst : float = dstv.length_squared()
-		
-	var cam_facing : Vector3 = -camera.global_transform.basis.z
-	var d : float = cam_facing.dot(dstv)
-		
-	if d > 0:
-		if visible:
-			hide()
-		return
-	else:
-		if not visible:
-			show()
-		
-	var screen_position : Vector2 = camera.unproject_position(world_position)
-	var new_pos : Vector2 = Vector2(screen_position.x + rect_position.x, screen_position.y + rect_position.y - 60)
-	
-	set_position(new_pos)
-	
-
-func damage(pos : Vector3, value : int, crit : bool) -> void:
-	setup(pos, damage_color, value, crit)
-	
-func heal(pos : Vector3, value : int, crit : bool) -> void:
-	setup(pos, heal_color, value, crit)
-
-func setup(pos : Vector3, color : Color, value : int, crit : bool) -> void:
-	world_position = pos
-	
-	camera = get_tree().get_root().get_camera() as Camera
-	
-	text = str(value)
-	add_color_override("font_color", color)
-	
-	if crit:
-		animation_player.play("crit")
-	else:
-		animation_player.play("normal")
-		
-	set_process(true)
-
-func animation_finished(anim_name : String) -> void:
-	queue_free()

game/ui/numbers/Number.tscn

@@ -1,92 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://ui/numbers/Number.gd" type="Script" id=1]
-[ext_resource path="res://ui/numbers/number_font.tres" type="DynamicFont" id=2]
-
-[sub_resource type="Animation" id=1]
-resource_name = "crit"
-length = 1.5
-tracks/0/type = "value"
-tracks/0/path = NodePath(".:rect_scale")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/keys = {
-"times": PoolRealArray( 0, 0.05, 0.3, 1.5 ),
-"transitions": PoolRealArray( 1, 0.307786, 1, 1.36604 ),
-"update": 0,
-"values": [ Vector2( 0.1, 0.1 ), Vector2( 1.5, 1.5 ), Vector2( 1.3, 1.3 ), Vector2( 1.3, 1.3 ) ]
-}
-tracks/1/type = "value"
-tracks/1/path = NodePath(".:rect_position")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/keys = {
-"times": PoolRealArray( 0, 0.6, 1.5 ),
-"transitions": PoolRealArray( 1, 1, 1 ),
-"update": 0,
-"values": [ Vector2( -50, 20 ), Vector2( -50, 20 ), Vector2( -50, 10 ) ]
-}
-tracks/2/type = "value"
-tracks/2/path = NodePath(".:modulate")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/keys = {
-"times": PoolRealArray( 0, 1.2, 1.5 ),
-"transitions": PoolRealArray( 1, 1, 4 ),
-"update": 0,
-"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
-}
-
-[sub_resource type="Animation" id=2]
-resource_name = "normal"
-length = 2.0
-tracks/0/type = "value"
-tracks/0/path = NodePath(".:rect_position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/keys = {
-"times": PoolRealArray( 0, 2 ),
-"transitions": PoolRealArray( 1, 1 ),
-"update": 0,
-"values": [ Vector2( -50, 20 ), Vector2( -50, 0 ) ]
-}
-tracks/1/type = "value"
-tracks/1/path = NodePath(".:modulate")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/keys = {
-"times": PoolRealArray( 0, 1.5, 2 ),
-"transitions": PoolRealArray( 1, 1, 4 ),
-"update": 0,
-"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
-}
-
-[node name="Number" type="Label"]
-modulate = Color( 1, 1, 1, 0 )
-margin_left = -50.0
-margin_right = 50.0
-margin_bottom = 40.0006
-rect_scale = Vector2( 1.3, 1.3 )
-rect_pivot_offset = Vector2( 50, 20 )
-custom_fonts/font = ExtResource( 2 )
-custom_colors/font_color = Color( 0.870588, 0.898039, 0.0117647, 1 )
-align = 1
-valign = 1
-script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-anims/crit = SubResource( 1 )
-anims/normal = SubResource( 2 )

game/ui/numbers/number_font.tres

@@ -1,8 +0,0 @@
-[gd_resource type="DynamicFont" load_steps=2 format=2]
-
-[ext_resource path="res://fonts/VT323-Regular.ttf" type="DynamicFontData" id=1]
-
-
-[resource]
-size = 12
-font_data = ExtResource( 1 )

game/ui/player/actionbars/ActionBar.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/actionbars/ActionBar.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/actionbars/ActionBarEntry.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/actionbars/ActionBar.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/actionbars/ActionBarEntry.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/actionbars/ActionBar.gd" type="Script" id=2]
 
 [node name="ActionBar" type="VBoxContainer"]
 anchor_left = 1.0

game/ui/player/actionbars/ActionBarEntry.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -44,6 +44,9 @@ var categ_cd : float = 0
 var has_gcd : bool = false
 var gcd : float = 0.0
 
+var show_keybind_text : bool = true
+var show_cooldown_text : bool = true
+
 func _ready() -> void:
 	button = get_node(button_path) as Button
 	icon_rect = get_node(icon_path) as TextureRect
@@ -56,6 +59,19 @@ func _ready() -> void:
 	
 	ProfileManager.connect("keybinds_changed", self, "on_keybinds_changed")
 
+	show_keybind_text = Settings.get_value("ui", "actionbar_show_keybind_text")
+	show_cooldown_text = Settings.get_value("ui", "actionbar_show_coldown_text")
+	
+	Settings.connect("setting_changed", self, "on_setting_changed")
+	
+	if show_keybind_text:
+		keybind_text.show()
+	else:
+		keybind_text.hide()
+		
+	if !show_cooldown_text:
+		cooldown_text.hide()
+	
 func _exit_tree():
 	if icon_rect.texture != null:
 		ThemeAtlas.unref_texture(icon_rect.texture)
@@ -90,6 +106,8 @@ func _process(delta : float) -> void:
 
 func set_cooldown_time(time : float) -> void:
 	cooldown_indicator.value = time
+	
+	if show_cooldown_text:
 		cooldown_text.text = str(int(time))
 
 func show_cooldown_timer(max_time : float) -> void:
@@ -100,10 +118,14 @@ func show_cooldown_timer(max_time : float) -> void:
 		cooldown_indicator.max_value = max_time
 	
 	cooldown_indicator.show()
+	
+	if show_cooldown_text:
 		cooldown_text.show()
 	
 func hide_cooldown_timer() -> void:
 	cooldown_indicator.hide()
+	
+	if show_cooldown_text:
 		cooldown_text.hide()
 
 func set_button_entry(action_bar_button_entry: ActionBarButtonEntry, p_player: Entity) -> void:
@@ -386,3 +408,24 @@ func _cgcd_started(e : Entity, value :float) -> void:
 	
 func _cgcd_finished(val) -> void:
 	gcd = 0
+
+func on_setting_changed(section, key, value):
+	if section == "ui":
+		if key == "actionbar_show_keybind_text":
+			show_keybind_text = value
+			
+			if show_keybind_text:
+				keybind_text.show()
+			else:
+				keybind_text.hide()
+			
+		elif key == "actionbar_show_coldown_text":
+			show_cooldown_text = value
+			
+			if cd > 0.2 || categ_cd > 0.2:
+				#The update loop should take care of the rest
+				if show_cooldown_text:
+					cooldown_text.show()
+				else:
+					cooldown_text.hide()
+	

game/ui/player/actionbars/ActionBarEntry.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://ui/actionbars/ActionBarEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/actionbars/ActionBarEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/cooldown_progress.png" type="Texture" id=2]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=3]
 [ext_resource path="res://ui/theme/actionbar_dynamicfont.tres" type="DynamicFont" id=5]
@@ -9,12 +9,10 @@
 margin_right = 46.0
 margin_bottom = 46.0
 rect_min_size = Vector2( 46, 46 )
-focus_mode = 0
 theme = ExtResource( 3 )
 shortcut_in_tooltip = false
 action_mode = 0
 button_mask = 3
-enabled_focus_mode = 0
 keep_pressed_outside = true
 script = ExtResource( 1 )
 __meta__ = {

game/ui/player/actionbars/Actionbars.gd

@@ -1,6 +1,6 @@
 extends Node
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -49,6 +49,7 @@ func _centity_data_changed(cls: EntityData) -> void:
 		return
 
 	_abp = _player.get_action_bar_profile()
+	_abp.connect("changed", self, "on_changed")
 	
 	for i in range(_abp.get_action_bar_count()):
 		var abe = _abp.get_action_bar(i)
@@ -67,4 +68,6 @@ func clear_actionbars() -> void:
 	for c in children:
 		c.queue_free()
 		
-	
+func on_changed() -> void:
+	#todo
+	pass

game/ui/player/actionbars/Actionbars.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/actionbars/Actionbars.gd" type="Script" id=1]
-[ext_resource path="res://ui/actionbars/ActionBar.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/actionbars/Actionbars.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/actionbars/ActionBar.tscn" type="PackedScene" id=2]
 
 [node name="Actionbars" type="HBoxContainer"]
 anchor_right = 1.0

game/ui/player/actionbars/EditorKeybindSetup.gd

@@ -1,7 +1,7 @@
 tool
 extends Node
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/actionbars/game_module.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/actionbars/Actionbars.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/actionbars/Actionbars.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )

game/ui/player/auraframe/AuraEntry.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/auraframe/AuraEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/auraframe/AuraEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_dynamicfont_small.tres" type="DynamicFont" id=2]
 
 [node name="AuraEntry" type="VBoxContainer"]

game/ui/player/auraframe/AuraFrame.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/auraframe/AuraFrame.gd" type="Script" id=1]
-[ext_resource path="res://ui/auraframe/AuraEntry.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/auraframe/AuraFrame.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/auraframe/AuraEntry.tscn" type="PackedScene" id=2]
 
 [node name="AuraFrame" type="Control"]
 anchor_right = 1.0
@@ -20,6 +20,10 @@ anchor_left = 1.0
 anchor_right = 1.0
 margin_left = -335.0
 margin_bottom = 157.0
+mouse_filter = 2
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
 margin_right = 335.0

game/ui/player/auraframe/game_module.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/unitframes/Unitframes.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/auraframe/AuraFrame.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )

game/ui/player/bags/Bag.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/bags/InventoryGUI.gd" type="Script" id=2]
-[ext_resource path="res://ui/bags/BagEntry.tscn" type="PackedScene" id=3]
-[ext_resource path="res://ui/bags/EquipmentSlot.tscn" type="PackedScene" id=4]
-[ext_resource path="res://ui/bags/ItemTooltip.tscn" type="PackedScene" id=5]
+[ext_resource path="res://ui/player/bags/InventoryGUI.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/bags/BagEntry.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/bags/EquipmentSlot.tscn" type="PackedScene" id=4]
+[ext_resource path="res://ui/player/bags/ItemTooltip.tscn" type="PackedScene" id=5]
 
 [node name="Inventory" type="Control"]
 anchor_right = 1.0

game/ui/player/bags/BagEntry.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/bags/BagEntry.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://ui/bags/BagEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/bags/BagEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/cooldown_progress.png" type="Texture" id=2]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=3]
 [ext_resource path="res://ui/theme/actionbar_dynamicfont.tres" type="DynamicFont" id=5]
@@ -10,14 +10,12 @@ margin_top = 1.0
 margin_right = 45.0
 margin_bottom = 46.0
 rect_min_size = Vector2( 45, 45 )
-focus_mode = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme = ExtResource( 3 )
 shortcut_in_tooltip = false
 action_mode = 0
 button_mask = 3
-enabled_focus_mode = 0
 keep_pressed_outside = true
 script = ExtResource( 1 )
 __meta__ = {

game/ui/player/bags/BagFrame.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/bags/BagFrame.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/bags/Bag.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/bags/BagFrame.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/bags/Bag.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/bags/BagFrame.gd" type="Script" id=2]
 
 [node name="BagFrame" type="Control"]
 anchor_right = 1.0

game/ui/player/bags/EquipmentSlot.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/bags/EquipmentSlot.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/bags/EquipmentSlot.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/bags/EquipmentSlot.gd" type="Script" id=1]
 
 [node name="EquipmentSlot" type="Button"]
 margin_left = 84.0

game/ui/player/bags/InventoryGUI.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/bags/InventoryWindow.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/bags/ItemEntry.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/bags/BaseWindow.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/bags/ItemEntry.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/bags/BaseWindow.tscn" type="PackedScene" id=2]
 
 
 

game/ui/player/bags/ItemPupop.gd

@@ -1,6 +1,6 @@
 extends PopupPanel
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/bags/ItemTooltip.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/bags/ItemPupop.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/bags/ItemPupop.gd" type="Script" id=1]
 
 [node name="ItemTooltip" type="PopupPanel"]
 margin_right = 295.0

game/ui/player/bags/game_module.tres

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://ui/theme/bag_icon.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
-[ext_resource path="res://ui/bags/Bag.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/bags/Bag.tscn" type="PackedScene" id=3]
 
 [resource]
 script = ExtResource( 2 )

game/ui/player/castbar/Castbar.gd

@@ -1,6 +1,6 @@
 extends VBoxContainer
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/castbar/Castbar.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/castbar/Castbar.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/castbar/Castbar.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/scrollbar_grabber_blue.tres" type="StyleBox" id=2]
 
 [node name="Castbar" type="VBoxContainer"]

game/ui/player/castbar/game_module.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/castbar/Castbar.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/castbar/Castbar.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )

game/ui/player/character/CharacterWindow.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/character/CharacterWindow.gd" type="Script" id=2]
-[ext_resource path="res://ui/character/SingleStatRow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/character/CharacterWindow.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/character/SingleStatRow.tscn" type="PackedScene" id=3]
 
 [node name="CharacterWindow" type="Control"]
 anchor_right = 1.0

game/ui/player/character/SingleStatRow.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/character/SingleStatRow.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/character/SingleStatRow.gd" type="Script" id=1]
 
 [node name="SingleStatRow" type="HBoxContainer"]
 margin_right = 1016.0

game/ui/player/character/game_module.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=4 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/character/CharacterWindow.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/character/CharacterWindow.tscn" type="PackedScene" id=2]
 [ext_resource path="res://ui/theme/character_icon.tres" type="Texture" id=3]
 
 [resource]

game/ui/player/crafting/CraftItemDescription.gd

@@ -1,6 +1,6 @@
 extends HBoxContainer
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/crafting/CraftingWindow.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/crafting/CraftingWindow.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/crafting/CraftingWindow.gd" type="Script" id=2]
-[ext_resource path="res://ui/crafting/RecipeSelector.tscn" type="PackedScene" id=3]
-[ext_resource path="res://ui/crafting/ItemEntry.tscn" type="PackedScene" id=4]
-[ext_resource path="res://ui/crafting/CraftItemDescription.gd" type="Script" id=5]
+[ext_resource path="res://ui/player/crafting/CraftingWindow.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/crafting/RecipeSelector.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/crafting/ItemEntry.tscn" type="PackedScene" id=4]
+[ext_resource path="res://ui/player/crafting/CraftItemDescription.gd" type="Script" id=5]
 
 [sub_resource type="ButtonGroup" id=1]
 

game/ui/player/crafting/ItemEntry.gd

@@ -1,6 +1,6 @@
 extends PanelContainer
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/crafting/ItemEntry.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/crafting/ItemEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/crafting/ItemEntry.gd" type="Script" id=1]
 
 [node name="ItemEntry" type="PanelContainer"]
 margin_right = 695.0

game/ui/player/crafting/RecipeSelector.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/crafting/RecipeSelector.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/crafting/RecipeSelector.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/crafting/RecipeSelector.gd" type="Script" id=1]
 
 [node name="RecipeSelector" type="Button"]
 margin_right = 303.0

game/ui/player/crafting/game_module.tres

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://ui/theme/crafting_icon.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
-[ext_resource path="res://ui/crafting/CraftingWindow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/crafting/CraftingWindow.tscn" type="PackedScene" id=3]
 
 [resource]
 script = ExtResource( 2 )

game/ui/player/loot_window/LootEntry.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/loot_window/LootEntry.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/loot_window/LootEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/loot_window/LootEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
 
 [node name="lootEntry" type="PanelContainer"]

game/ui/player/loot_window/LootWindow.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/loot_window/LootWindow.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/loot_window/LootWindow.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/loot_window/LootWindow.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
-[ext_resource path="res://ui/loot_window/LootEntry.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/loot_window/LootEntry.tscn" type="PackedScene" id=3]
 
 [node name="LootWindow" type="Control"]
 anchor_right = 1.0

game/ui/player/loot_window/game_module.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
-[ext_resource path="res://ui/loot_window/LootWindow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/loot_window/LootWindow.tscn" type="PackedScene" id=3]
 
 [resource]
 script = ExtResource( 2 )

game/ui/player/menu/CharacterEntry.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/menu/CharacterEntry.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/menu/CharacterEntry.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/menu/CharacterEntry.gd" type="Script" id=2]
 
 [node name="CharacterEntry" type="Button"]
 margin_right = 224.0

game/ui/player/player_ui/RemoveProfile.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/player_ui/buttons/Buttons.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/player_ui/buttons/ImageButton.tscn

@@ -7,9 +7,7 @@ margin_right = 25.0
 margin_bottom = 40.0
 rect_min_size = Vector2( 25, 30 )
 hint_tooltip = "Inventory"
-focus_mode = 0
 toggle_mode = true
-enabled_focus_mode = 0
 keep_pressed_outside = true
 __meta__ = {
 "_edit_use_anchors_": false

game/ui/player/player_ui/ingame_menu/ExitButton.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/player/player_ui/ingame_menu/IngameMenu.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/options/Options.tscn" type="PackedScene" id=2]
-[ext_resource path="res://ui/ingame_menu/ExitButton.gd" type="Script" id=3]
-[ext_resource path="res://ui/keybinds/Keybinds.tscn" type="PackedScene" id=4]
-[ext_resource path="res://ui/interface/InterfaceOptions.tscn" type="PackedScene" id=5]
+[ext_resource path="res://ui/player/player_ui/ingame_menu/ExitButton.gd" type="Script" id=2]
+[ext_resource path="res://ui/windows/options/Options.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/windows/keybinds/Keybinds.tscn" type="PackedScene" id=4]
+[ext_resource path="res://ui/player/player_ui/interface/InterfaceOptions.tscn" type="PackedScene" id=5]
 
 [node name="IngameMenu" type="Control"]
 anchor_right = 1.0
@@ -65,9 +65,9 @@ margin_top = 136.0
 margin_right = 147.0
 margin_bottom = 162.57
 text = "Exit"
-script = ExtResource( 3 )
+script = ExtResource( 2 )
 
-[node name="Options" parent="." instance=ExtResource( 2 )]
+[node name="Options" parent="." instance=ExtResource( 3 )]
 visible = false
 anchor_left = 0.5
 anchor_top = 0.5

game/ui/player/player_ui/interface/InterfaceOptions.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/interface/SetActionbarAsDefault.gd" type="Script" id=1]
-[ext_resource path="res://ui/interface/InterfaceOptions.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/player_ui/interface/SetActionbarAsDefault.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/player_ui/interface/InterfaceOptions.gd" type="Script" id=2]
 
 [node name="InterfaceOptions" type="PanelContainer"]
 anchor_right = 1.0
@@ -49,4 +49,5 @@ margin_right = 1010.0
 margin_bottom = 20.0
 text = "Set current actionbar setup as default"
 script = ExtResource( 1 )
+
 [connection signal="pressed" from="VBoxContainer2/HBoxContainer/Button" to="." method="hide"]