Skip to content

Commit f62564f

Browse files
authored
Merge pull request #1343 from endlessm/grappling-blue-storyweaver
Grappling hook level: Use blue StoryWeaver
2 parents dca8bff + 4eb245e commit f62564f

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_end.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[ext_resource type="TileSet" uid="uid://07fq3rspk8ia" path="res://scenes/tileset.tres" id="2_02b1a"]
55
[ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="3_7h0hr"]
66
[ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="4_j6qjo"]
7-
[ext_resource type="SpriteFrames" uid="uid://07di3updrwh0" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_purple.tres" id="5_6dpig"]
7+
[ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="5_1dsdq"]
88
[ext_resource type="PackedScene" uid="uid://evb46lm6ssu2" path="res://scenes/game_elements/props/hookable_pin/hookable_pin.tscn" id="6_rci8f"]
99
[ext_resource type="PackedScene" uid="uid://dvj15pnuqr2ua" path="res://scenes/game_elements/props/hookable_button_item/hookable_button_item.tscn" id="7_hf4li"]
1010
[ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="8_nt6an"]
@@ -46,7 +46,7 @@ position = Vector2(934, 609)
4646
scale = Vector2(1.03448, 1)
4747
player_name = "Storyweaver"
4848
mode = 2
49-
sprite_frames = ExtResource("5_6dpig")
49+
sprite_frames = ExtResource("5_1dsdq")
5050

5151
[node name="Camera2D" type="Camera2D" parent="OnTheGround/Player"]
5252
zoom = Vector2(0.8, 0.8)

scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_needles.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[ext_resource type="TileSet" uid="uid://07fq3rspk8ia" path="res://scenes/tileset.tres" id="2_dwcg4"]
55
[ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="3_mg68y"]
66
[ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="4_m6xvq"]
7-
[ext_resource type="SpriteFrames" uid="uid://07di3updrwh0" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_purple.tres" id="5_8ufyd"]
7+
[ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="5_dwcg4"]
88
[ext_resource type="PackedScene" uid="uid://1vunygl4wpj6" path="res://scenes/game_elements/props/button_item/button_item.tscn" id="6_w164g"]
99
[ext_resource type="PackedScene" uid="uid://dvj15pnuqr2ua" path="res://scenes/game_elements/props/hookable_button_item/hookable_button_item.tscn" id="7_txgtg"]
1010
[ext_resource type="PackedScene" uid="uid://dohb701lxbe5s" path="res://scenes/game_elements/props/hookable_needle/hookable_needle.tscn" id="8_s5uk4"]
@@ -63,7 +63,7 @@ position = Vector2(232, 462)
6363
scale = Vector2(1.03448, 1)
6464
player_name = "Storyweaver"
6565
mode = 2
66-
sprite_frames = ExtResource("5_8ufyd")
66+
sprite_frames = ExtResource("5_dwcg4")
6767

6868
[node name="Camera2D" type="Camera2D" parent="OnTheGround/Player"]
6969
limit_left = 192

scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_pins.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[ext_resource type="TileSet" uid="uid://07fq3rspk8ia" path="res://scenes/tileset.tres" id="1_dbigu"]
44
[ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="2_5vumy"]
55
[ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="3_w8fse"]
6-
[ext_resource type="SpriteFrames" uid="uid://07di3updrwh0" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_purple.tres" id="4_sqxkk"]
6+
[ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="4_syhn3"]
77
[ext_resource type="PackedScene" uid="uid://evb46lm6ssu2" path="res://scenes/game_elements/props/hookable_pin/hookable_pin.tscn" id="5_udo54"]
88
[ext_resource type="PackedScene" uid="uid://1vunygl4wpj6" path="res://scenes/game_elements/props/button_item/button_item.tscn" id="6_8mj0p"]
99
[ext_resource type="PackedScene" uid="uid://dvj15pnuqr2ua" path="res://scenes/game_elements/props/hookable_button_item/hookable_button_item.tscn" id="7_g02tq"]
@@ -37,7 +37,7 @@ position = Vector2(174, 1313)
3737
scale = Vector2(1.03448, 1)
3838
player_name = "Storyweaver"
3939
mode = 2
40-
sprite_frames = ExtResource("4_sqxkk")
40+
sprite_frames = ExtResource("4_syhn3")
4141

4242
[node name="Camera2D" type="Camera2D" parent="OnTheGround/Player"]
4343
limit_left = 0

scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_powerup.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="2_hx14g"]
66
[ext_resource type="PackedScene" uid="uid://dohb701lxbe5s" path="res://scenes/game_elements/props/hookable_needle/hookable_needle.tscn" id="4_7gbyj"]
77
[ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="4_rup4f"]
8-
[ext_resource type="SpriteFrames" uid="uid://07di3updrwh0" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_purple.tres" id="5_ptg16"]
8+
[ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="5_7gbyj"]
99
[ext_resource type="Script" uid="uid://dagrhfrj0f33i" path="res://scenes/game_logic/camera_behaviors/frame_camera_behavior.gd" id="6_7gbyj"]
1010
[ext_resource type="PackedScene" uid="uid://evb46lm6ssu2" path="res://scenes/game_elements/props/hookable_pin/hookable_pin.tscn" id="6_vodlh"]
1111
[ext_resource type="PackedScene" uid="uid://dvj15pnuqr2ua" path="res://scenes/game_elements/props/hookable_button_item/hookable_button_item.tscn" id="7_rlnni"]
@@ -81,7 +81,7 @@ position = Vector2(1632, 2312)
8181
scale = Vector2(1.03448, 1)
8282
player_name = "Storyweaver"
8383
mode = 2
84-
sprite_frames = ExtResource("5_ptg16")
84+
sprite_frames = ExtResource("5_7gbyj")
8585

8686
[node name="Camera2D" type="Camera2D" parent="OnTheGround/Player"]
8787
limit_left = -1792

scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_start.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[ext_resource type="TileSet" uid="uid://07fq3rspk8ia" path="res://scenes/tileset.tres" id="1_0g35k"]
44
[ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="2_85rkf"]
55
[ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="3_gbtro"]
6-
[ext_resource type="SpriteFrames" uid="uid://07di3updrwh0" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_purple.tres" id="4_10ahs"]
6+
[ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="4_10ahs"]
77
[ext_resource type="PackedScene" uid="uid://evb46lm6ssu2" path="res://scenes/game_elements/props/hookable_pin/hookable_pin.tscn" id="5_cspw2"]
88
[ext_resource type="PackedScene" uid="uid://dvj15pnuqr2ua" path="res://scenes/game_elements/props/hookable_button_item/hookable_button_item.tscn" id="6_3g3x4"]
99
[ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="7_upilw"]

0 commit comments

Comments
 (0)