Skip to content

Commit 3cb6366

Browse files
committed
Sterowaniowe rzeczy
1 parent 2a5e559 commit 3cb6366

18 files changed

+492
-73
lines changed
File renamed without changes.

Graphics/UI/Enter.png.import Graphics/UI/Keys/Enter.png.import

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
importer="texture"
44
type="StreamTexture"
5-
path="res://.import/Enter.png-de3a4522d1a0a741b48d795570026cb4.stex"
5+
path="res://.import/Enter.png-d500a9ae3a44a1a1eaafb1e2d09f1e53.stex"
66
metadata={
77
"vram_texture": false
88
}
99

1010
[deps]
1111

12-
source_file="res://Graphics/UI/Enter.png"
13-
dest_files=[ "res://.import/Enter.png-de3a4522d1a0a741b48d795570026cb4.stex" ]
12+
source_file="res://Graphics/UI/Keys/Enter.png"
13+
dest_files=[ "res://.import/Enter.png-d500a9ae3a44a1a1eaafb1e2d09f1e53.stex" ]
1414

1515
[params]
1616

Graphics/UI/Keys/Normal.png

1.13 KB
Loading

Graphics/UI/Keys/Normal.png.import

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/Normal.png-be7ccb3ca6a80422d3c11aa165e709be.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://Graphics/UI/Keys/Normal.png"
13+
dest_files=[ "res://.import/Normal.png-be7ccb3ca6a80422d3c11aa165e709be.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=true
24+
flags/mipmaps=false
25+
flags/anisotropic=false
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
stream=false
32+
size_limit=0
33+
detect_3d=true
34+
svg/scale=1.0

Graphics/UI/Keys/Tall.png

1.03 KB
Loading

Graphics/UI/Keys/Tall.png.import

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/Tall.png-606ed22bd61df7f9192937b0724a736c.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://Graphics/UI/Keys/Tall.png"
13+
dest_files=[ "res://.import/Tall.png-606ed22bd61df7f9192937b0724a736c.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=true
24+
flags/mipmaps=false
25+
flags/anisotropic=false
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
stream=false
32+
size_limit=0
33+
detect_3d=true
34+
svg/scale=1.0

Graphics/UI/Keys/Wide.png

894 Bytes
Loading

Graphics/UI/Keys/Wide.png.import

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/Wide.png-0388d8def2d2f8da1ce3b02a9462331b.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://Graphics/UI/Keys/Wide.png"
13+
dest_files=[ "res://.import/Wide.png-0388d8def2d2f8da1ce3b02a9462331b.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=true
24+
flags/mipmaps=false
25+
flags/anisotropic=false
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
stream=false
32+
size_limit=0
33+
detect_3d=true
34+
svg/scale=1.0

Nodes/Player.tscn

+10-10
Original file line numberDiff line numberDiff line change
@@ -215,19 +215,19 @@ func _on_Animation_animation_finished(anim_name):
215215
elif anim_name.find(\"Attack\"):
216216
$\"..\".attack_end()"
217217

218-
[sub_resource type="CanvasItemMaterial" id=14]
218+
[sub_resource type="CanvasItemMaterial" id=10]
219219
blend_mode = 1
220220

221-
[sub_resource type="RectangleShape2D" id=10]
221+
[sub_resource type="RectangleShape2D" id=11]
222222
extents = Vector2( 24, 32 )
223223

224-
[sub_resource type="RayShape2D" id=11]
224+
[sub_resource type="RayShape2D" id=12]
225225
length = 32.0
226226

227-
[sub_resource type="RectangleShape2D" id=12]
227+
[sub_resource type="RectangleShape2D" id=13]
228228
extents = Vector2( 24, 48 )
229229

230-
[sub_resource type="Animation" id=13]
230+
[sub_resource type="Animation" id=14]
231231
loop = true
232232
tracks/0/type = "value"
233233
tracks/0/path = NodePath(".:position")
@@ -283,7 +283,7 @@ texture = ExtResource( 4 )
283283
position = Vector2( 3, -11 )
284284

285285
[node name="Sprite" type="Sprite" parent="Sprite"]
286-
material = SubResource( 14 )
286+
material = SubResource( 10 )
287287
texture = ExtResource( 5 )
288288
hframes = 14
289289

@@ -297,12 +297,12 @@ hframes = 10
297297
[node name="Collider" type="CollisionShape2D" parent="."]
298298
visible = false
299299
position = Vector2( 0, -16 )
300-
shape = SubResource( 10 )
300+
shape = SubResource( 11 )
301301

302302
[node name="ColliderRay" type="CollisionShape2D" parent="."]
303303
visible = false
304304
position = Vector2( 0, 16 )
305-
shape = SubResource( 11 )
305+
shape = SubResource( 12 )
306306

307307
[node name="Name" type="Label" parent="."]
308308
margin_left = -19.0
@@ -320,7 +320,7 @@ collision_layer = 0
320320
collision_mask = 2
321321

322322
[node name="Collider2" type="CollisionShape2D" parent="Hitbox"]
323-
shape = SubResource( 12 )
323+
shape = SubResource( 13 )
324324

325325
[node name="ManaTimer" type="Timer" parent="."]
326326
autostart = true
@@ -334,7 +334,7 @@ position = Vector2( 0, -96 )
334334
texture = ExtResource( 7 )
335335

336336
[node name="Animation" type="AnimationPlayer" parent="PressUp"]
337-
anims/Idle = SubResource( 13 )
337+
anims/Idle = SubResource( 14 )
338338
[connection signal="animation_finished" from="Animation" to="Animation" method="_on_Animation_animation_finished"]
339339
[connection signal="frame_changed" from="Sprite" to="." method="set_frame"]
340340
[connection signal="body_entered" from="Hitbox" to="." method="on_hit"]

Nodes/UI/Chat.tscn

-1
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,4 @@ focus_mode = 1
5656
context_menu_enabled = false
5757
placeholder_text = "Press T to chat"
5858
caret_blink = true
59-
6059
[connection signal="text_changed" from="Container/Input/Text" to="." method="on_text"]

Nodes/UI/Key.tscn

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[gd_scene load_steps=5 format=2]
2+
3+
[ext_resource path="res://Graphics/UI/Keys/Normal.png" type="Texture" id=1]
4+
[ext_resource path="res://Resources/UI/BoldFont.tres" type="DynamicFont" id=2]
5+
[ext_resource path="res://Resources/UI/BiggerFont.tres" type="DynamicFont" id=3]
6+
7+
[sub_resource type="GDScript" id=1]
8+
script/source = "extends TextureRect
9+
10+
const TEXTURES = [preload(\"res://Graphics/UI/Keys/Normal.png\"), preload(\"res://Graphics/UI/Keys/Wide.png\"), preload(\"res://Graphics/UI/Keys/Tall.png\"), preload(\"res://Graphics/UI/Keys/Enter.png\")]
11+
12+
export var action = \"\"
13+
export var function = \"\"
14+
15+
func _ready():
16+
var key = KEY_SPACE
17+
texture = TEXTURES[KeyList.keys[key].type]
18+
get_child(0).text = KeyList.keys[key].name
19+
get_child(1).text = function"
20+
21+
[node name="Key" type="TextureRect"]
22+
margin_right = 100.0
23+
margin_bottom = 100.0
24+
texture = ExtResource( 1 )
25+
script = SubResource( 1 )
26+
27+
[node name="Name" type="Label" parent="."]
28+
anchor_right = 1.0
29+
anchor_bottom = 1.0
30+
custom_fonts/font = ExtResource( 2 )
31+
custom_colors/font_color = Color( 0, 0, 0, 1 )
32+
text = "ESC"
33+
align = 1
34+
valign = 1
35+
36+
[node name="Function" type="Label" parent="."]
37+
anchor_left = 1.0
38+
anchor_right = 1.0
39+
anchor_bottom = 1.0
40+
custom_fonts/font = ExtResource( 3 )
41+
text = "What to do"
42+
valign = 1

Nodes/UI/PlayerMenu.tscn

+11-10
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ margin_bottom = 131.0
250250
rect_min_size = Vector2( 0, 16 )
251251

252252
[node name="Tabs" type="Control" parent="Container"]
253+
editor/display_folded = true
253254
margin_top = 131.0
254255
margin_right = 736.0
255256
margin_bottom = 131.0
@@ -893,6 +894,8 @@ editor/display_folded = true
893894
margin_right = 364.0
894895
margin_bottom = 32.0
895896
type = "Trigger"
897+
color = Color( 1, 0, 0, 1 )
898+
no_select = false
896899

897900
[node name="Active" parent="Container/Tabs/Souls/Slots" instance=ExtResource( 13 )]
898901
editor/display_folded = true
@@ -902,6 +905,7 @@ margin_bottom = 32.0
902905
type = "Active"
903906
soul = "Skeleton Disguise"
904907
color = Color( 0, 0, 1, 1 )
908+
no_select = false
905909

906910
[node name="Icon" parent="Container/Tabs/Souls/Slots/Active" index="0"]
907911
self_modulate = Color( 0, 0, 1, 1 )
@@ -935,6 +939,7 @@ margin_bottom = 72.0
935939
type = "Augment"
936940
soul = "STR+"
937941
color = Color( 1, 1, 0, 1 )
942+
no_select = false
938943

939944
[node name="Icon" parent="Container/Tabs/Souls/Slots/Augment" index="0"]
940945
self_modulate = Color( 1, 1, 0, 1 )
@@ -969,6 +974,7 @@ margin_bottom = 72.0
969974
type = "Enchant"
970975
soul = "Razor Blade"
971976
color = Color( 1, 0, 1, 1 )
977+
no_select = false
972978

973979
[node name="Icon" parent="Container/Tabs/Souls/Slots/Enchant" index="0"]
974980
self_modulate = Color( 1, 0, 1, 1 )
@@ -1001,6 +1007,7 @@ margin_bottom = 112.0
10011007
type = "Extension"
10021008
soul = "Enchanced Bone Throw"
10031009
color = Color( 1, 1, 1, 0.501961 )
1010+
no_select = false
10041011

10051012
[node name="Icon" parent="Container/Tabs/Souls/Slots/Extension" index="0"]
10061013
self_modulate = Color( 1, 1, 1, 0.501961 )
@@ -1226,16 +1233,6 @@ margin_bottom = -4.0
12261233
custom_fonts/font = ExtResource( 8 )
12271234
text = "hello this is description"
12281235

1229-
[node name="Tab" type="Label" parent="."]
1230-
margin_left = 304.141
1231-
margin_top = 81.979
1232-
margin_right = 432.141
1233-
margin_bottom = 98.979
1234-
rect_min_size = Vector2( 128, 0 )
1235-
text = "[TAB]"
1236-
align = 1
1237-
valign = 1
1238-
12391236
[node name="SoulSelect" type="NinePatchRect" parent="."]
12401237
visible = false
12411238
margin_right = 40.0
@@ -1246,6 +1243,10 @@ patch_margin_top = 4
12461243
patch_margin_right = 4
12471244
patch_margin_bottom = 4
12481245

1246+
[node name="Help" type="Control" parent="."]
1247+
margin_right = 40.0
1248+
margin_bottom = 40.0
1249+
12491250
[editable path="Container/Tabs/Souls/Slots/Active"]
12501251

12511252
[editable path="Container/Tabs/Souls/Slots/Augment"]

Scenes/Title.tscn

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[ext_resource path="res://Resources/UI/BiggerFont.tres" type="DynamicFont" id=4]
77
[ext_resource path="res://Graphics/Characters/PlayerClear.png" type="Texture" id=5]
88
[ext_resource path="res://Graphics/Characters/PlayerValue.png" type="Texture" id=6]
9-
[ext_resource path="res://Graphics/UI/Enter.png" type="Texture" id=7]
9+
[ext_resource path="res://Graphics/UI/Keys/Enter.png" type="Texture" id=7]
1010

1111
[sub_resource type="GDScript" id=1]
1212
resource_name = "LoginScreen"
@@ -228,10 +228,10 @@ flags = 4
228228
atlas = ExtResource( 5 )
229229
region = Rect2( 0, 0, 98, 98 )
230230
231-
[sub_resource type="CanvasItemMaterial" id=8]
231+
[sub_resource type="CanvasItemMaterial" id=7]
232232
blend_mode = 1
233233
234-
[sub_resource type="AtlasTexture" id=7]
234+
[sub_resource type="AtlasTexture" id=8]
235235
flags = 4
236236
atlas = ExtResource( 6 )
237237
region = Rect2( 0, 0, 98, 98 )
@@ -392,10 +392,10 @@ margin_bottom = 134.964
392392
texture = SubResource( 6 )
393393
394394
[node name="Value" type="TextureRect" parent="Menu/Preview"]
395-
material = SubResource( 8 )
395+
material = SubResource( 7 )
396396
margin_right = 1372.0
397397
margin_bottom = 98.0
398-
texture = SubResource( 7 )
398+
texture = SubResource( 8 )
399399
400400
[node name="Register" type="VBoxContainer" parent="Menu"]
401401
visible = false

0 commit comments

Comments
 (0)