oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Huge cleanup (#420)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-10-25 08:59:07 +02:00
committed by GitHub
parent 3de06adcf9
commit 94d86d24d5
101 changed files with 1091 additions and 67952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addons/escoria-ui-9verbs/fonts/caslonantique.tres Normal file
View File

@@ -0,0 +1,7 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]
[ext_resource path="res://addons/escoria-ui-9verbs/fonts/caslonantique.ttf" type="DynamicFontData" id=1]
[resource]
size = 21
font_data = ExtResource( 1 )

BIN
addons/escoria-ui-9verbs/fonts/caslonantique.ttf Executable file
View File

Binary file not shown.

15
addons/escoria-ui-9verbs/game.gd
View File

@@ -32,7 +32,8 @@ Implement methods to react to inputs.
onready var verbs_menu = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/VerbsMargin/verbs_menu
onready var tooltip = $ui/Control/panel_down/VBoxContainer/tooltip
onready var tooltip = $ui/Control/panel_down/VBoxContainer/MarginContainer\
/tooltip
onready var room_select = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/MainMargin/VBoxContainer/room_select
onready var pause_menu = $ui/pause_menu
@@ -46,6 +47,18 @@ func _enter_tree():
self,
"_on_action_finished"
)
var room_selector_parent = $ui/Control/panel_down/VBoxContainer\
/HBoxContainer/MainMargin/VBoxContainer
if ProjectSettings.get_setting("escoria/debug/enable_room_selector") and \
room_selector_parent.get_node_or_null("room_select") == null:
room_selector_parent.add_child(
preload(
"res://addons/escoria-core/ui_library/tools/room_select" +\
"/room_select.tscn"
).instance()
)
func _exit_tree():
escoria.action_manager.disconnect(

33
addons/escoria-ui-9verbs/game.tscn
View File

@@ -6,9 +6,9 @@
[ext_resource path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-ui-9verbs/game.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" type="PackedScene" id=6]
[ext_resource path="res://game/ui/commons/room_select.tscn" type="PackedScene" id=7]
[ext_resource path="res://addons/escoria-ui-9verbs/tooltip/tooltip_action_target.gd" type="Script" id=8]
[ext_resource path="res://game/ui/commons/pause_menu/pause_menu.tscn" type="PackedScene" id=9]
[ext_resource path="res://addons/escoria-core/ui_library/menus/pause_menu/pause_menu.tscn" type="PackedScene" id=9]
[ext_resource path="res://addons/escoria-ui-9verbs/theme.tres" type="Theme" id=10]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.6, 0.6, 0.6, 0.5 )
@@ -22,6 +22,7 @@ script = ExtResource( 5 )
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 2
theme = ExtResource( 10 )
__meta__ = {
"_edit_use_anchors_": false
}
@@ -40,13 +41,20 @@ __meta__ = {
margin_right = 1280.0
margin_bottom = 270.0
[node name="tooltip" parent="ui/Control/panel_down/VBoxContainer" instance=ExtResource( 1 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 0.0
[node name="MarginContainer" type="MarginContainer" parent="ui/Control/panel_down/VBoxContainer"]
margin_right = 1280.0
margin_bottom = 32.0
rect_min_size = Vector2( 0, 32 )
custom_constants/margin_top = 10
[node name="tooltip" parent="ui/Control/panel_down/VBoxContainer/MarginContainer" instance=ExtResource( 1 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 10.0
margin_right = 1280.0
margin_bottom = 32.0
bbcode_text = "[center]Test[/center]"
text = "Test"
fit_content_height = true
script = ExtResource( 8 )
color = Color( 1, 1, 1, 1 )
@@ -96,9 +104,9 @@ margin_bottom = 200.0
[node name="MarginContainer" type="MarginContainer" parent="ui/Control/panel_down/VBoxContainer/HBoxContainer/MainMargin/VBoxContainer"]
margin_left = 142.0
margin_top = 58.0
margin_top = 70.0
margin_right = 242.0
margin_bottom = 98.0
margin_bottom = 110.0
rect_min_size = Vector2( 100, 40 )
size_flags_horizontal = 6
size_flags_vertical = 6
@@ -108,12 +116,6 @@ margin_right = 100.0
margin_bottom = 40.0
text = "Menu"
[node name="room_select" parent="ui/Control/panel_down/VBoxContainer/HBoxContainer/MainMargin/VBoxContainer" instance=ExtResource( 7 )]
margin_top = 160.0
margin_right = 384.0
margin_bottom = 180.0
size_flags_horizontal = 3
[node name="InventoryMargin" type="MarginContainer" parent="ui/Control/panel_down/VBoxContainer/HBoxContainer"]
margin_left = 856.0
margin_right = 1280.0
@@ -148,6 +150,7 @@ __meta__ = {
[node name="pause_menu" parent="ui" instance=ExtResource( 9 )]
visible = false
theme = ExtResource( 10 )
[node name="camera" parent="." instance=ExtResource( 6 )]

2
addons/escoria-ui-9verbs/inventory/inventory_ui.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-core/game/scenes/inventory/inventory_ui.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-core/library/inventory/esc_inventory_container.gd" type="Script" id=3]
[ext_resource path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" type="Script" id=3]
[node name="inventory_ui" type="PanelContainer"]
margin_right = 600.0

6
addons/escoria-ui-9verbs/theme.tres Normal file
View File

@@ -0,0 +1,6 @@
[gd_resource type="Theme" load_steps=2 format=2]
[ext_resource path="res://addons/escoria-ui-9verbs/fonts/caslonantique.tres" type="DynamicFont" id=1]
[resource]
default_font = ExtResource( 1 )

25
addons/escoria-ui-9verbs/tooltip/action_target_tooltip.tscn
View File

@@ -1,16 +1,6 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=2 format=2]
[ext_resource path="res://addons/escoria-core/game/assets/fonts/onesize/ONESIZE_.TTF" type="DynamicFontData" id=1]
[sub_resource type="DynamicFont" id=1]
size = 30
font_data = ExtResource( 1 )
[sub_resource type="DynamicFont" id=2]
size = 30
font_data = ExtResource( 1 )
[sub_resource type="GDScript" id=3]
[sub_resource type="GDScript" id=1]
script/source = "extends ESCTooltip
@@ -37,17 +27,12 @@ func update_tooltip_text():
"
[node name="tooltip" type="RichTextLabel"]
anchor_right = 0.7
anchor_bottom = 0.06
margin_left = 1.49829
margin_right = 1.21826
margin_bottom = -10.0
custom_fonts/mono_font = SubResource( 1 )
custom_fonts/normal_font = SubResource( 2 )
anchor_right = 1.0
anchor_bottom = 1.0
bbcode_enabled = true
bbcode_text = "[center][/center]"
scroll_active = false
script = SubResource( 3 )
script = SubResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}