diff --git a/scenes/quests/story_quests/champ/1_combat/champ_combat.tscn b/scenes/quests/story_quests/champ/1_combat/champ_combat.tscn index a2ec3f0cae..b15b492f38 100644 --- a/scenes/quests/story_quests/champ/1_combat/champ_combat.tscn +++ b/scenes/quests/story_quests/champ/1_combat/champ_combat.tscn @@ -10,15 +10,19 @@ [ext_resource type="TileSet" uid="uid://bo4jyvl3lcww1" path="res://scenes/quests/story_quests/champ/champ_tileset.tres" id="6_sm7tj"] [ext_resource type="SpriteFrames" uid="uid://ctjbkxw0r2f2i" path="res://scenes/quests/story_quests/champ/player_components/champ_player.tres" id="7_utai8"] [ext_resource type="PackedScene" uid="uid://c481vrtlq627b" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_throwing_enemy.tscn" id="8_yidpm"] +[ext_resource type="PackedScene" uid="uid://dcm505t3resui" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_1.tscn" id="11_j60m7"] [ext_resource type="PackedScene" uid="uid://y8ha8abfyap2" path="res://scenes/game_elements/props/filling_barrel/filling_barrel.tscn" id="11_p0sed"] +[ext_resource type="PackedScene" uid="uid://c5k6fap2ic04l" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_2.tscn" id="12_8ja4x"] [ext_resource type="SpriteFrames" uid="uid://0kjkk0ekjgcd" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_target_spriteframes.tres" id="12_x632n"] [ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="13_45tp4"] +[ext_resource type="PackedScene" uid="uid://driu5llb873ns" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_3.tscn" id="13_418m7"] +[ext_resource type="Texture2D" uid="uid://dyyu8w3qtm6q5" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png" id="14_1o4lf"] [ext_resource type="Script" uid="uid://bgmwplmj3bfls" path="res://scenes/globals/game_state/inventory/inventory_item.gd" id="14_bn425"] +[ext_resource type="Texture2D" uid="uid://ckjior4vavgpy" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.png" id="15_nn4ti"] [ext_resource type="PackedScene" uid="uid://cfcgrfvtn04yp" path="res://scenes/ui_elements/hud/hud.tscn" id="15_qewm5"] [ext_resource type="PackedScene" uid="uid://cd24crxnn6c3n" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/buoy.tscn" id="15_sm7tj"] -[ext_resource type="Texture2D" uid="uid://deck2r88iqbd7" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/placeholder_bait_sign_1.png" id="17_r6jc5"] -[ext_resource type="Texture2D" uid="uid://b4f7rwxe4w45h" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/placeholder_bait_sign_2.png" id="18_utai8"] -[ext_resource type="Texture2D" uid="uid://e8g4e5k3mjyq" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/placeholder_bait_sign_3.png" id="19_yidpm"] +[ext_resource type="Texture2D" uid="uid://d18ih8m6cmx8d" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png" id="16_wkm6s"] +[ext_resource type="Texture2D" uid="uid://ct7ux8rnh0gyo" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png" id="17_j60m7"] [ext_resource type="Texture2D" uid="uid://b8bo7js8fgtvq" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/circular_ripples.png" id="21_yidpm"] [ext_resource type="Texture2D" uid="uid://bopnrtenvp4sm" path="res://scenes/quests/story_quests/champ/tiles/assets/water_ripples.png" id="22_hv7kx"] @@ -251,13 +255,23 @@ sprite_frames = ExtResource("7_utai8") [node name="ThrowingNPC2" parent="OnTheGround/ThrowingEnemies" unique_id=481399762 instance=ExtResource("8_yidpm")] position = Vector2(1537, 673) odd_shoot = true +projectile_scene_for_label = Dictionary[String, PackedScene]({ +"a": ExtResource("11_j60m7"), +"b": ExtResource("12_8ja4x"), +"c": ExtResource("13_418m7") +}) [node name="ThrowingNPC4" parent="OnTheGround/ThrowingEnemies" unique_id=774333023 instance=ExtResource("8_yidpm")] position = Vector2(414, 695) +projectile_scene_for_label = Dictionary[String, PackedScene]({ +"a": ExtResource("11_j60m7"), +"b": ExtResource("12_8ja4x"), +"c": ExtResource("13_418m7") +}) [node name="Targets" type="Node2D" parent="OnTheGround" unique_id=60590667] -[node name="Target" parent="OnTheGround/Targets" unique_id=510399694 instance=ExtResource("11_p0sed")] +[node name="Target1" parent="OnTheGround/Targets" unique_id=510399694 instance=ExtResource("11_p0sed")] z_index = 1 position = Vector2(233, 518) scale = Vector2(2, 2) @@ -299,15 +313,27 @@ scale = Vector2(1.5, 1.5) [node name="PlaceholderBaitSign1" type="Sprite2D" parent="OnTheGround/Signs" unique_id=1362706441] position = Vector2(175, 711) -texture = ExtResource("17_r6jc5") +texture = ExtResource("14_1o4lf") -[node name="PlaceholderBaitSign2" type="Sprite2D" parent="OnTheGround/Signs" unique_id=1334877674] -position = Vector2(1541, 695) -texture = ExtResource("18_utai8") +[node name="BaitSprite1" type="Sprite2D" parent="OnTheGround/Signs/PlaceholderBaitSign1" unique_id=2081143706] +texture = ExtResource("15_nn4ti") +offset = Vector2(-1, -10) -[node name="PlaceholderBaitSign3" type="Sprite2D" parent="OnTheGround/Signs" unique_id=715278387] +[node name="PlaceholderBaitSign2" type="Sprite2D" parent="OnTheGround/Signs" unique_id=715278387] position = Vector2(773, 688) -texture = ExtResource("19_yidpm") +texture = ExtResource("14_1o4lf") + +[node name="BaitSprite2" type="Sprite2D" parent="OnTheGround/Signs/PlaceholderBaitSign2" unique_id=1687502515] +texture = ExtResource("16_wkm6s") +offset = Vector2(-1, -10) + +[node name="PlaceholderBaitSign3" type="Sprite2D" parent="OnTheGround/Signs" unique_id=1334877674] +position = Vector2(1541, 695) +texture = ExtResource("14_1o4lf") + +[node name="BaitSprite3" type="Sprite2D" parent="OnTheGround/Signs/PlaceholderBaitSign3" unique_id=1249786011] +texture = ExtResource("17_j60m7") +offset = Vector2(-1, -10) [node name="CollectibleItem" parent="OnTheGround" unique_id=1968420657 instance=ExtResource("13_45tp4")] unique_name_in_owner = true diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.png b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.png index 19bbce4e93..e6b2d9392c 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.png +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:697f4d0abc6ae3709ff0e98e34ace36a0830db278a09c336e2e271cd07a989ef -size 430 +oid sha256:3af4b87d6bc675f53694d1b41122d36a925074e26dc5e00f974e1737c300cf93 +size 424 diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.tres b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.tres index 7af9227769..edd9bb79a6 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.tres +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.tres @@ -1,16 +1,16 @@ [gd_resource type="SpriteFrames" format=3 uid="uid://5puy1xk3bfva"] -[ext_resource type="Texture2D" uid="uid://ckjior4vavgpy" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.png" id="1_1w4xd"] +[ext_resource type="Texture2D" uid="uid://ckjior4vavgpy" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_1.png" id="1_alduf"] -[sub_resource type="AtlasTexture" id="AtlasTexture_a16ge"] -atlas = ExtResource("1_1w4xd") +[sub_resource type="AtlasTexture" id="AtlasTexture_3pi73"] +atlas = ExtResource("1_alduf") region = Rect2(0, 0, 64, 64) [resource] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_a16ge") +"texture": SubResource("AtlasTexture_3pi73") }], "loop": true, "name": &"default", diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png index 300c8991df..194bd33705 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1eaedcc20cd8c787ccc9bf43d962c63c5db41130e0eb6c725624dcc7ccc45c75 -size 435 +oid sha256:7f760a966c00e6d51e3d6e81f3b5ac57c8a8858db32256be7e15bd69372156ab +size 427 diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png.import b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png.import index 60086c961a..328d0864d6 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png.import +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://xioplli70d2n" +uid="uid://d18ih8m6cmx8d" path="res://.godot/imported/champ_bait_projectile_2.png-2b98f49fde6da92537b7539cef2af7ce.ctex" metadata={ "vram_texture": false diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.tres b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.tres index da81029810..03000c789a 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.tres +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.tres @@ -1,16 +1,16 @@ -[gd_resource type="SpriteFrames" format=3 uid="uid://dv3cyx0ecly3y"] +[gd_resource type="SpriteFrames" format=3 uid="uid://q0v1wdnrygas"] -[ext_resource type="Texture2D" uid="uid://xioplli70d2n" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png" id="1_3fh6q"] +[ext_resource type="Texture2D" uid="uid://d18ih8m6cmx8d" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.png" id="1_ogufj"] -[sub_resource type="AtlasTexture" id="AtlasTexture_qwcmc"] -atlas = ExtResource("1_3fh6q") +[sub_resource type="AtlasTexture" id="AtlasTexture_eraii"] +atlas = ExtResource("1_ogufj") region = Rect2(0, 0, 64, 64) [resource] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_qwcmc") +"texture": SubResource("AtlasTexture_eraii") }], "loop": true, "name": &"default", diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png index d83cb8f6ff..6ffc9ce85f 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb89824682f55f9776313c88237f0886f1ac390cba85d4d898716bddcaa9f3f9 -size 425 +oid sha256:1efcaffb65ba231a23cd0da7a50e4cee7bbcaa4e027059e3c8df9042d2c4540e +size 426 diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png.import b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png.import index 5ec647ba52..a40dbfd0a6 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png.import +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cayqkmu2ruwq8" +uid="uid://ct7ux8rnh0gyo" path="res://.godot/imported/champ_bait_projectile_3.png-3ed85c91311c06678fd1cfe5a03b4e6b.ctex" metadata={ "vram_texture": false diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.tres b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.tres index 8c0dd652a0..af049234a8 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.tres +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.tres @@ -1,16 +1,16 @@ -[gd_resource type="SpriteFrames" format=3 uid="uid://c4pkc6rmrg566"] +[gd_resource type="SpriteFrames" format=3 uid="uid://iyjta1h3tu4a"] -[ext_resource type="Texture2D" uid="uid://cayqkmu2ruwq8" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png" id="1_wb7p7"] +[ext_resource type="Texture2D" uid="uid://ct7ux8rnh0gyo" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.png" id="1_swyxf"] -[sub_resource type="AtlasTexture" id="AtlasTexture_yidpm"] -atlas = ExtResource("1_wb7p7") +[sub_resource type="AtlasTexture" id="AtlasTexture_cupop"] +atlas = ExtResource("1_swyxf") region = Rect2(0, 0, 64, 64) [resource] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_yidpm") +"texture": SubResource("AtlasTexture_cupop") }], "loop": true, "name": &"default", diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat.dialogue b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat.dialogue index f882221213..e06694a425 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat.dialogue +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat.dialogue @@ -5,8 +5,8 @@ Evan finds himself near Lake Champlain with three mysterious circles of air bubbles just off the shore. Curious what could be making these bubbles, he decides to throw bait at each of them to try and lure it out. He notices there are signs labeling the three bubble circles with the bait that might work best! -He believe he will only need to fill at least two of those to entice whatever lurk beneath it. -Of course, he could always experiment with something else that might be more enticing. (If so, be sure to change the Sprite Frames for each of the throwing enemies) +He believes he will only need to fill two of those to entice whatever lurk beneath it. +But...Oh no! The baits are missing some of their color!! Color in the `champ_bait_projectile` pngs so that Evan can better tell them apart! (Or draw an entirely new bait that Champ might want instead!) => END ~ well_done diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png new file mode 100644 index 0000000000..0b4682e785 --- /dev/null +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:611dd02a9531de8d92bff660ed802147f6f2cb372e54b20b5ea9c01089910acd +size 625 diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png.import b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png.import new file mode 100644 index 0000000000..351d4c8210 --- /dev/null +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dyyu8w3qtm6q5" +path="res://.godot/imported/champ_combat_bait_sign.png-5d10a1204c3cfab2fab2756d1c1f50a5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_combat_bait_sign.png" +dest_files=["res://.godot/imported/champ_combat_bait_sign.png-5d10a1204c3cfab2fab2756d1c1f50a5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_1.tscn b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_1.tscn index f7d8ea892b..b7f1dfc6b5 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_1.tscn +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_1.tscn @@ -21,6 +21,7 @@ continuous_cd = 2 contact_monitor = true max_contacts_reported = 1 script = ExtResource("1_7n1yb") +label = "a" [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1499726276] shape = SubResource("RectangleShape2D_o6xl0") diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_2.tscn b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_2.tscn index 8a509cbad7..baa26ee1ab 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_2.tscn +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_2.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://c5k6fap2ic04l"] [ext_resource type="Script" uid="uid://bofv3bcwj3rx2" path="res://scenes/game_elements/props/projectile/components/projectile.gd" id="1_vo5mr"] -[ext_resource type="SpriteFrames" uid="uid://dv3cyx0ecly3y" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.tres" id="2_vo5mr"] +[ext_resource type="SpriteFrames" uid="uid://q0v1wdnrygas" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_2.tres" id="2_vo5mr"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_tbgi4"] friction = 0.0 @@ -21,6 +21,7 @@ continuous_cd = 2 contact_monitor = true max_contacts_reported = 1 script = ExtResource("1_vo5mr") +label = "b" [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1499726276] shape = SubResource("RectangleShape2D_o6xl0") diff --git a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_3.tscn b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_3.tscn index 02e40ea432..db9a9a5e24 100644 --- a/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_3.tscn +++ b/scenes/quests/story_quests/champ/1_combat/combat_components/champ_projectile_3.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://driu5llb873ns"] [ext_resource type="Script" uid="uid://bofv3bcwj3rx2" path="res://scenes/game_elements/props/projectile/components/projectile.gd" id="1_vo5mr"] -[ext_resource type="SpriteFrames" uid="uid://c4pkc6rmrg566" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.tres" id="2_k63yj"] +[ext_resource type="SpriteFrames" uid="uid://iyjta1h3tu4a" path="res://scenes/quests/story_quests/champ/1_combat/combat_components/champ_bait_projectile_3.tres" id="2_k63yj"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_tbgi4"] friction = 0.0 @@ -21,6 +21,7 @@ continuous_cd = 2 contact_monitor = true max_contacts_reported = 1 script = ExtResource("1_vo5mr") +label = "c" [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1499726276] shape = SubResource("RectangleShape2D_o6xl0")