Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions scenes/quests/story_quests/champ/1_combat/champ_combat.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand Down