diff --git a/assets/third_party/tiny-swords/Deco/17.png b/assets/third_party/tiny-swords/Deco/17.png index fe653e234e..82f1f236c9 100644 --- a/assets/third_party/tiny-swords/Deco/17.png +++ b/assets/third_party/tiny-swords/Deco/17.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3da63203ae56798b0188fc09c376bdb7ea6de74a8c1930c4ec6f7d02b5881ac -size 2023 +oid sha256:78929657309673ffd1f8d16a72f4e667fd7de84e88f4e23dff3de89922b243b0 +size 2510 diff --git a/scenes/game_elements/props/sign/components/sign.gd b/scenes/game_elements/props/sign/components/sign.gd index 0b45a69336..541fc68837 100644 --- a/scenes/game_elements/props/sign/components/sign.gd +++ b/scenes/game_elements/props/sign/components/sign.gd @@ -3,6 +3,11 @@ @tool extends Node2D +enum Frame { + NON_DIRECTIONAL = 0, + LEFT_AND_RIGHT = 1, +} + @export var direction: Enums.LookAtSide = Enums.LookAtSide.LEFT: set(a_direction): direction = a_direction @@ -27,7 +32,12 @@ func _ready() -> void: func update_appearance() -> void: - $Appearance.flip_h = direction == Enums.LookAtSide.RIGHT + if direction == Enums.LookAtSide.UNSPECIFIED: + %Appearance.frame = Frame.NON_DIRECTIONAL + %Appearance.flip_h = false + else: + %Appearance.frame = Frame.LEFT_AND_RIGHT + %Appearance.flip_h = direction == Enums.LookAtSide.RIGHT func _on_area_2d_body_entered(_body: Node2D) -> void: diff --git a/scenes/game_elements/props/sign/sign.tscn b/scenes/game_elements/props/sign/sign.tscn index 8bbebe34c5..d57778df6e 100644 --- a/scenes/game_elements/props/sign/sign.tscn +++ b/scenes/game_elements/props/sign/sign.tscn @@ -18,8 +18,11 @@ radius = 80.0 script = ExtResource("1_cb2ey") [node name="Appearance" type="Sprite2D" parent="." unique_id=1364985273] +unique_name_in_owner = true texture = ExtResource("2_85li6") offset = Vector2(0, -30) +hframes = 2 +frame = 1 [node name="Collider" type="StaticBody2D" parent="." unique_id=882843758] collision_layer = 16 diff --git a/scenes/quests/story_quests/shjourney/3_shjourney_intro/sign.tscn b/scenes/quests/story_quests/shjourney/3_shjourney_intro/sign.tscn deleted file mode 100644 index 76c8f4ccf8..0000000000 --- a/scenes/quests/story_quests/shjourney/3_shjourney_intro/sign.tscn +++ /dev/null @@ -1,67 +0,0 @@ -[gd_scene format=3 uid="uid://ccoqpcy371psq"] - -[ext_resource type="Script" uid="uid://o54tdc374nxc" path="res://scenes/game_elements/props/sign/components/sign.gd" id="1_onayf"] -[ext_resource type="Texture2D" uid="uid://cq5l1xle30ch7" path="res://assets/third_party/tiny-swords/Deco/17.png" id="2_cl2dx"] -[ext_resource type="FontFile" uid="uid://b0tjcgrk504qg" path="res://assets/third_party/fonts/jersey/Jersey10-Regular.ttf" id="3_s8nls"] - -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_cb2ey"] -radius = 12.0 -height = 50.0 - -[sub_resource type="CircleShape2D" id="CircleShape2D_85li6"] -radius = 80.0 - -[node name="Sign" type="Node2D" unique_id=1135001698] -script = ExtResource("1_onayf") - -[node name="Appearance" type="Sprite2D" parent="." unique_id=1240587292] -texture = ExtResource("2_cl2dx") -offset = Vector2(0, -30) - -[node name="Collider" type="StaticBody2D" parent="." unique_id=928850480] -collision_layer = 16 -collision_mask = 0 - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Collider" unique_id=376594617] -rotation = -1.57079 -shape = SubResource("CapsuleShape2D_cb2ey") - -[node name="LabelContainer" type="MarginContainer" parent="." unique_id=596602004] -z_index = 1 -offset_left = -96.0 -offset_top = -176.0 -offset_right = 104.0 -offset_bottom = -76.0 -pivot_offset = Vector2(100, 50) - -[node name="PanelContainer" type="PanelContainer" parent="LabelContainer" unique_id=106614807] -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 8 - -[node name="MarginContainer" type="MarginContainer" parent="LabelContainer/PanelContainer" unique_id=291767994] -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 8 -theme_override_constants/margin_left = 10 -theme_override_constants/margin_top = 5 -theme_override_constants/margin_right = 10 -theme_override_constants/margin_bottom = 5 - -[node name="Label" type="Label" parent="LabelContainer/PanelContainer/MarginContainer" unique_id=1078434041] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 4 -theme_override_fonts/font = ExtResource("3_s8nls") -theme_override_font_sizes/font_size = 19 -horizontal_alignment = 1 -vertical_alignment = 2 - -[node name="Area2D" type="Area2D" parent="." unique_id=1542241989] -collision_layer = 4 - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=1596599531] -shape = SubResource("CircleShape2D_85li6") - -[connection signal="body_entered" from="Area2D" to="." method="_on_area_2d_body_entered"] -[connection signal="body_exited" from="Area2D" to="." method="_on_area_2d_body_exited"] diff --git a/scenes/quests/story_quests/shjourney/3_shjourney_intro/template_intro0.2.tscn b/scenes/quests/story_quests/shjourney/3_shjourney_intro/template_intro0.2.tscn index 2730c31a5f..02527a6165 100644 --- a/scenes/quests/story_quests/shjourney/3_shjourney_intro/template_intro0.2.tscn +++ b/scenes/quests/story_quests/shjourney/3_shjourney_intro/template_intro0.2.tscn @@ -22,8 +22,8 @@ [ext_resource type="Script" uid="uid://3tn8210agfwf" path="res://scenes/quests/story_quests/shjourney/3_shjourney_intro/area_2d.gd" id="14_u3mgm"] [ext_resource type="SpriteFrames" uid="uid://c63hg7u58lfak" path="res://scenes/quests/story_quests/shjourney/Otros_componentes/angel_sprite_frames.tres" id="15_x6v85"] [ext_resource type="Resource" uid="uid://7g75vdxbo0nr" path="res://scenes/quests/story_quests/shjourney/Angel/components/dialogo-angel.dialogue" id="17_4ttmx"] +[ext_resource type="PackedScene" uid="uid://covsdqqsd6rsy" path="res://scenes/game_elements/props/sign/sign.tscn" id="24_6ltfn"] [ext_resource type="PackedScene" uid="uid://dpbsi065gmh8a" path="res://scenes/game_elements/fx/fog/fog.tscn" id="25_0hk53"] -[ext_resource type="PackedScene" uid="uid://ccoqpcy371psq" path="res://scenes/quests/story_quests/shjourney/3_shjourney_intro/sign.tscn" id="29_oixsc"] [ext_resource type="PackedScene" uid="uid://due8sqsrtdke1" path="res://scenes/quests/story_quests/shjourney/Otros_componentes/fire_fly.tscn" id="30_g2jpu"] [sub_resource type="Curve2D" id="Curve2D_s8exg"] @@ -562,7 +562,7 @@ position = Vector2(1023, 202) modulate = Color(18.892157, 18.892157, 18.892157, 1) scroll_scale = Vector2(1.9, 1.3) -[node name="Sign" parent="." unique_id=348337612 instance=ExtResource("29_oixsc")] +[node name="Sign" parent="." unique_id=1579530966 instance=ExtResource("24_6ltfn")] position = Vector2(617, 203) direction = 1 text = "Si ves azul donde no debería, vas por donde sí."