Skip to content

Commit 4eb5604

Browse files
authored
Merge pull request #1700 from endlessm/shjourney-sequence_puzzle_assistant-talker-cleanup
Sueños Nocturnos: Miscellaneous cleanup
2 parents d3405f8 + 95d9c6a commit 4eb5604

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

scenes/quests/story_quests/shjourney/8_shjourney_outro/Outro.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[ext_resource type="TileSet" uid="uid://bpyv8qhmeyo6l" path="res://scenes/quests/story_quests/shjourney/3_shjourney_intro/tilesetIntro.tres" id="2_r1lym"]
77
[ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="3_14vr6"]
88
[ext_resource type="PackedScene" uid="uid://p6q2uo2us0il" path="res://scenes/quests/story_quests/shjourney/light.tscn" id="5_14vr6"]
9-
[ext_resource type="PackedScene" uid="uid://b3lldk3lo2mwl" path="res://scenes/game_elements/characters/npcs/sequence_puzzle_assistant/sequence_puzzle_assistant.tscn" id="6_s07u0"]
9+
[ext_resource type="PackedScene" uid="uid://ipvcfv2g0oi1" path="res://scenes/game_elements/characters/npcs/talker/talker.tscn" id="6_s07u0"]
1010
[ext_resource type="Texture2D" uid="uid://bnfq0mr48gai7" path="res://assets/third_party/tiny-swords/Factions/Knights/Buildings/House/House_Blue.png" id="7_qomnf"]
1111
[ext_resource type="Material" uid="uid://bmwe2wu7hxepf" path="res://scenes/game_elements/props/tree/components/wind_affected_material.tres" id="8_bov4k"]
1212
[ext_resource type="PackedScene" uid="uid://covsdqqsd6rsy" path="res://scenes/game_elements/props/sign/sign.tscn" id="9_3dk7l"]

scenes/quests/story_quests/shjourney/8_shjourney_outro/template_combat_components/ArbolFanstamatscn.tscn

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

scenes/quests/story_quests/shjourney/9_shjourney_outro_2/Outro2.tscn

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[ext_resource type="AudioStream" uid="uid://bpg26wj03771j" path="res://scenes/quests/story_quests/shjourney/2_shjourney_intro/template_intro_components/EffectSounds/emotional-orchestral-music.wav" id="7_ijlyl"]
1111
[ext_resource type="Texture2D" uid="uid://bnfq0mr48gai7" path="res://assets/third_party/tiny-swords/Factions/Knights/Buildings/House/House_Blue.png" id="8_ijlyl"]
1212
[ext_resource type="Script" uid="uid://dqt03qd2chv6n" path="res://scenes/quests/story_quests/shjourney/3_shjourney_intro/cinematic_siguiente.gd" id="8_pkup3"]
13-
[ext_resource type="PackedScene" uid="uid://b3lldk3lo2mwl" path="res://scenes/game_elements/characters/npcs/sequence_puzzle_assistant/sequence_puzzle_assistant.tscn" id="10_j0a3a"]
13+
[ext_resource type="PackedScene" uid="uid://ipvcfv2g0oi1" path="res://scenes/game_elements/characters/npcs/talker/talker.tscn" id="10_j0a3a"]
1414
[ext_resource type="SpriteFrames" uid="uid://8xxbcslwu8ti" path="res://scenes/quests/story_quests/shjourney/8_shjourney_outro/template_combat_components/ArbolFanstasma.tres" id="12_f0pqt"]
1515
[ext_resource type="Script" uid="uid://3tn8210agfwf" path="res://scenes/quests/story_quests/shjourney/3_shjourney_intro/area_2d.gd" id="12_gpc53"]
1616
[ext_resource type="Script" uid="uid://uru8f5jj8nvo" path="res://scenes/quests/story_quests/shjourney/8_shjourney_outro/cinematicOutro2.gd" id="13_oxm0q"]
@@ -460,10 +460,6 @@ speed_scale = 0.5
460460

461461
[node name="Camera2D" type="Camera2D" parent="Node2D/AnimationPlayer/Character"]
462462
process_mode = 3
463-
position = Vector2(-3.65778, 19.3588)
464-
rotation = 3.14159
465-
scale = Vector2(3.09964e+06, -1071.01)
466-
skew = 0.000253081
467463
zoom = Vector2(1.3, 1.3)
468464
limit_left = 0
469465
limit_top = 0

0 commit comments

Comments
 (0)