Skip to content

Commit 43a9adc

Browse files
authored
Integrate new grappling hook assets (#2116)
## Integrate new pin and needle assets As delivered by PixelFrog. Update the position of elements in the corresponding scenes too. Move the sprite and adjust the marker and control for hooking. They only differ in a few pixels so it shouldn't be any gameplay regression. ## Integrate new arrow indicator PixelFrog has delivered 2 new assets: an indicator pointing down and another pointing up. The "up" should be used in the player. And this commit does so. The "down" will be used as indicator in things that can be hooked, and potentially for indicating other things on screen. Use the "up" indicator in the HookControl, rotated by 90 degrees. Put these assets in assets/first_party/ because they can be multipurpose. Remove the previous arrow asset. Resolve #2117 Resolve #2118
1 parent 93a65ce commit 43a9adc

11 files changed

Lines changed: 65 additions & 21 deletions

File tree

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://cheu0l1ap1r8y"
6+
path="res://.godot/imported/indicator_down.png-81b27a1df0f3bd35c1109092855eabd9.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://assets/first_party/user_interface/indicator_down.png"
14+
dest_files=["res://.godot/imported/indicator_down.png-81b27a1df0f3bd35c1109092855eabd9.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/uastc_level=0
22+
compress/rdo_quality_loss=0.0
23+
compress/hdr_compression=1
24+
compress/normal_map=0
25+
compress/channel_pack=0
26+
mipmaps/generate=false
27+
mipmaps/limit=-1
28+
roughness/mode=0
29+
roughness/src_normal=""
30+
process/channel_remap/red=0
31+
process/channel_remap/green=1
32+
process/channel_remap/blue=2
33+
process/channel_remap/alpha=3
34+
process/fix_alpha_border=true
35+
process/premult_alpha=false
36+
process/normal_map_invert_y=false
37+
process/hdr_as_srgb=false
38+
process/hdr_clamp_exposure=false
39+
process/size_limit=0
40+
detect_3d/compress_to=1
Lines changed: 3 additions & 0 deletions
Loading

scenes/game_elements/props/hook_control/components/arrow.png.import renamed to assets/first_party/user_interface/indicator_up.png.import

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
importer="texture"
44
type="CompressedTexture2D"
5-
uid="uid://cchrnxunruf23"
6-
path="res://.godot/imported/arrow.png-76f2bfa8cc4ff49280c3d32a329912e3.ctex"
5+
uid="uid://cfyxgtc6bvss8"
6+
path="res://.godot/imported/indicator_up.png-26231997b81b8961a51bd74b2a181a90.ctex"
77
metadata={
88
"vram_texture": false
99
}
1010

1111
[deps]
1212

13-
source_file="res://scenes/game_elements/props/hook_control/components/arrow.png"
14-
dest_files=["res://.godot/imported/arrow.png-76f2bfa8cc4ff49280c3d32a329912e3.ctex"]
13+
source_file="res://assets/first_party/user_interface/indicator_up.png"
14+
dest_files=["res://.godot/imported/indicator_up.png-26231997b81b8961a51bd74b2a181a90.ctex"]
1515

1616
[params]
1717

scenes/game_elements/props/hook_control/components/arrow.png

Lines changed: 0 additions & 3 deletions
This file was deleted.

scenes/game_elements/props/hook_control/hook_control.tscn

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[gd_scene format=3 uid="uid://b0dehcnfo68j1"]
22

33
[ext_resource type="Script" uid="uid://b2mu5bkiqrds3" path="res://scenes/game_elements/props/hook_control/components/hook_control.gd" id="1_bevaw"]
4-
[ext_resource type="Texture2D" uid="uid://cchrnxunruf23" path="res://scenes/game_elements/props/hook_control/components/arrow.png" id="2_41e7o"]
4+
[ext_resource type="Texture2D" uid="uid://cfyxgtc6bvss8" path="res://assets/first_party/user_interface/indicator_up.png" id="2_q883k"]
55

66
[node name="HookControl" type="Node2D" unique_id=1022482491]
77
script = ExtResource("1_bevaw")
88

9-
[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1749177115]
9+
[node name="Sprite2D" type="Sprite2D" parent="." unique_id=444359890]
1010
unique_name_in_owner = true
1111
position = Vector2(51, 0)
12-
texture = ExtResource("2_41e7o")
12+
rotation = 1.5707964
13+
texture = ExtResource("2_q883k")
1314

1415
[node name="RayCast2D" type="RayCast2D" parent="." unique_id=1829820383]
1516
unique_name_in_owner = true
Lines changed: 2 additions & 2 deletions
Loading

scenes/game_elements/props/hookable_needle/hookable_needle.tscn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ collision_layer = 16
1414
collision_mask = 0
1515

1616
[node name="Sprite2D" type="Sprite2D" parent="." unique_id=283948262]
17-
position = Vector2(0, -32)
17+
position = Vector2(0, -24)
1818
texture = ExtResource("1_51v7k")
1919

2020
[node name="HookableArea" type="Area2D" parent="." unique_id=1826386316 node_paths=PackedStringArray("controlled_entity", "hook_control", "anchor_point")]
@@ -32,10 +32,10 @@ shape = SubResource("RectangleShape2D_bfd1i")
3232
debug_color = Color(0.689707, 0.288376, 1, 0.42)
3333

3434
[node name="Marker2D" type="Marker2D" parent="HookableArea" unique_id=335701191]
35-
position = Vector2(0, -48)
35+
position = Vector2(0, -45)
3636

3737
[node name="HookControl" parent="HookableArea" unique_id=1853420814 node_paths=PackedStringArray("hook_area") instance=ExtResource("3_te154")]
38-
position = Vector2(0, -48)
38+
position = Vector2(0, -45)
3939
hook_area = NodePath("..")
4040

4141
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1038684912]
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:aefcdb01bfd3c2664885237c7af9de86ff805cb8789eae57636987383d22c2f4
3-
size 744
2+
oid sha256:1842a17da47da7094e52e7961e4fbd8da4061f934371a6e860c60266ed0cad15
3+
size 1513

0 commit comments

Comments
 (0)