Set up beetroot quest and added cat to indoor scene.

feature/fight_system
kziolkowski 6 months ago
parent e84ef716f6
commit 199d0873c8

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c4q12jiligcl7"
path="res://.godot/imported/katze.png-0faf4775b24cd38949e4c4160b5ed047.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://art/animals/katze.png"
dest_files=["res://.godot/imported/katze.png-0faf4775b24cd38949e4c4160b5ed047.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
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/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

@ -1,3 +1,3 @@
join Vesna2 center
join vesna left
Thats the last one. I should get back to Yeli.
[end_timeline]

@ -1,5 +1,5 @@
join Yeli center
join Vesna2 center
join vesna left
Yeli (_part_side): Come here, you little quacking beast!
- What a mess!
- You havent called me that way yet.

@ -1,16 +1,16 @@
join Yeli center
join Vesna2 center
join Yeli right
join vesna left
Yeli (_part_side): You see, you dont need a man to keep your garden in shape.
- Just a little help from Vesna.
- Frankly, I kept Vasily away from our garden after he destroyed our sunflowers.
Yeli (_part_side): Haha! True words.
Yeli (_part_side): Its your very first time in this house in a long time, isnt it?
Vesna2: Yes. And you have two cats now?
vesna: Yes. And you have two cats now?
Yeli (_part_side): No, no, the second bowl is for the Domovoi, as a gift.
Yeli (_part_side): Your Yeli still practices the old traditions.
Vesna2: And have you spotted any Domovois since?
vesna: And have you spotted any Domovois since?
Yeli (_part_side): No, but would you believe it, the cat grew double the size. Haha!
Vesna2: Your cat really gets the best of the best. Your soup already smells great!
vesna: Your cat really gets the best of the best. Your soup already smells great!
Yeli (_part_side): But its missing…something.
Yeli (_part_side): Ah!
label bring_beets

@ -21,13 +21,17 @@ itemToToggle = NodePath("../Inventory")
[node name="Inventory" type="Control" parent="." node_paths=PackedStringArray("_slotsParent", "_slotsMover", "_headerSlots", "_slotSelect")]
layout_mode = 3
anchors_preset = 8
anchors_preset = 7
anchor_left = 0.5
anchor_top = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 0.5
anchor_bottom = 1.0
offset_left = -116.0
offset_top = -53.0
offset_right = 231.82
offset_bottom = 141.4
grow_horizontal = 2
grow_vertical = 2
grow_vertical = 0
size_flags_vertical = 8
script = ExtResource("1_6wusm")
_slotsParent = NodePath("SlotsContainer/SlotsMover/Slots")

@ -183,13 +183,14 @@ animations = [{
}]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_aqu1t"]
radius = 202.0
height = 404.0
radius = 84.0
height = 168.0
[node name="Yeli" type="Node2D"]
[node name="Yeli" type="Node2D" node_paths=PackedStringArray("_sprite")]
z_index = 1
y_sort_enabled = true
script = ExtResource("1_at1n1")
script = ExtResource("1_hn8at")
_sprite = NodePath("TalkingControl/AnimatedSprite")
[node name="InteractionArea" parent="." instance=ExtResource("42_ahrat")]
position = Vector2(0, -450)
@ -207,10 +208,7 @@ offset_bottom = -142.633
theme_override_font_sizes/font_size = 60
text = "[E] talk"
[node name="TalkingControl" type="Node2D" parent="." node_paths=PackedStringArray("_sprite")]
script = ExtResource("1_hn8at")
_sprite = NodePath("AnimatedSprite")
_timelinesToPlay = PackedStringArray("yeli_intro_01", "yeli_intro_02", "yeli_intro_03", "yeli_intro_04")
[node name="TalkingControl" type="Node2D" parent="."]
[node name="AnimatedSprite" type="AnimatedSprite2D" parent="TalkingControl"]
y_sort_enabled = true
@ -219,17 +217,21 @@ animation = &"idle"
frame_progress = 0.437711
offset = Vector2(0, -450)
[node name="DialogicToggle" type="Node2D" parent="."]
[node name="Dialogic starter" type="Node2D" parent="."]
script = ExtResource("1_at1n1")
[node name="DialogicToggle" type="Node2D" parent="Dialogic starter"]
script = ExtResource("44_aqu1t")
[node name="AnimatableBody2D" type="AnimatableBody2D" parent="."]
position = Vector2(0, -172)
[node name="CollisionShape2D" type="CollisionShape2D" parent="AnimatableBody2D"]
position = Vector2(0, 94)
shape = SubResource("CapsuleShape2D_aqu1t")
[connection signal="Interacted" from="InteractionArea" to="TalkingControl" method="ToggleTalking"]
[connection signal="Talking" from="TalkingControl" to="." method="open"]
[connection signal="timelineEnded" from="DialogicToggle" to="TalkingControl" method="ToggleTalking"]
[connection signal="Talking" from="." to="Dialogic starter" method="open"]
[connection signal="Interacted" from="InteractionArea" to="." method="ToggleTalking"]
[connection signal="timelineEnded" from="Dialogic starter/DialogicToggle" to="." method="ToggleTalking"]
[editable path="InteractionArea"]

@ -34,9 +34,6 @@ stream_4/stream = ExtResource("12_dx1yn")
stream_5/stream = ExtResource("13_yuxo7")
stream_6/stream = ExtResource("14_xhefb")
[sub_resource type="Animation" id="Animation_kjie1"]
resource_name = "new_animation"
[sub_resource type="Animation" id="Animation_uo3dh"]
length = 0.001
tracks/0/type = "value"
@ -124,6 +121,9 @@ tracks/6/keys = {
"values": [false]
}
[sub_resource type="Animation" id="Animation_kjie1"]
resource_name = "new_animation"
[sub_resource type="AnimationLibrary" id="AnimationLibrary_54k4r"]
_data = {
&"RESET": SubResource("Animation_uo3dh"),
@ -162,7 +162,6 @@ z_index = 1
y_sort_enabled = true
position = Vector2(-5, -537)
rotation = 0.0135349
scale = Vector2(1, 1)
[node name="head" type="Sprite2D" parent="bodyLookingRight"]
z_index = 1

@ -0,0 +1,10 @@
[gd_resource type="Resource" script_class="QuestResource" load_steps=2 format=3 uid="uid://cbpurnewhyefa"]
[ext_resource type="Script" uid="uid://vji5lp4qc8pp" path="res://scripts/CSharp/Common/Quest/QuestResource.cs" id="1_na477"]
[resource]
script = ExtResource("1_na477")
id = "beetRoot"
title = "Get Beetroot!"
description = "Yeli needs some beetroot for her soup. She mentioned that there was another vegetable garden. You can access it through one of the fence gates."
metadata/_custom_type_script = "uid://vji5lp4qc8pp"

@ -1004,6 +1004,7 @@ y_sort_enabled = true
[node name="Yeli" parent="YSorted" instance=ExtResource("24_wtdui")]
position = Vector2(6403, 3362)
_timelinesToPlay = PackedStringArray("quest1_ducks_start", "quest1_ducks_end", "quest2_tomatoes_start", "quest2_tomatoes_interim", "quest2_tomatoes_end")
[node name="Vesna" parent="YSorted" node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_7wfwe")]
z_index = 1

@ -1,4 +1,4 @@
[gd_scene load_steps=27 format=3 uid="uid://bm21nqepnwaik"]
[gd_scene load_steps=31 format=3 uid="uid://bm21nqepnwaik"]
[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3vr4f"]
[ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ubg3a"]
@ -17,9 +17,13 @@
[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="14_d7yky"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="15_7a68a"]
[ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="15_27bwy"]
[ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="15_sndxu"]
[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="16_dhsxs"]
[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="17_k0k8c"]
[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="18_dw4nn"]
[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="21_blyw3"]
[ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="22_yd2gv"]
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="24_yd2gv"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"]
resource_local_to_scene = true
@ -354,6 +358,13 @@ texture = ExtResource("13_rongr")
region_enabled = true
region_rect = Rect2(1156, 1185, 940, 189)
[node name="Katze" type="Sprite2D" parent="BackWall"]
z_index = -10
position = Vector2(-4051, 332)
scale = Vector2(2, 2)
texture = ExtResource("15_sndxu")
offset = Vector2(-8, -126)
[node name="Room assets" type="Node" parent="BackWall"]
[node name="wood" type="Sprite2D" parent="BackWall/Room assets"]
@ -479,21 +490,34 @@ position = Vector2(-1464, 136)
[node name="Yeli" parent="." instance=ExtResource("16_dhsxs")]
position = Vector2(-2912, 432)
_timelinesToPlay = PackedStringArray("quest3_beets_start")
[node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"]
position = Vector2(-205.348, 131.907)
shape = SubResource("CircleShape2D_wuntg")
[node name="TalkingControl" parent="Yeli" index="1"]
_timelinesToPlay = PackedStringArray("yeli_intro_05")
[node name="Label" parent="Yeli/InteractionArea" index="1"]
offset_left = -332.62
offset_top = -99.8217
offset_right = -85.6204
offset_bottom = 3.17825
[node name="AnimatedSprite" parent="Yeli/TalkingControl" index="0"]
position = Vector2(-576, 368)
[node name="CollisionShape2D" parent="Yeli/AnimatableBody2D" index="0"]
position = Vector2(-565, 464)
[node name="dialogic_toggle" type="Node2D" parent="Yeli"]
script = ExtResource("17_k0k8c")
metadata/_custom_type_script = "uid://cvkw4qd2hxksi"
[node name="Beetroot Quest trigger" type="Node2D" parent="Yeli"]
script = ExtResource("21_blyw3")
questResource = ExtResource("22_yd2gv")
toStatus = 1
makeCurrent = true
[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
position = Vector2(-1534, -26)
offset = Vector2(0, -200)
@ -506,9 +530,11 @@ editor_draw_limits = true
script = ExtResource("18_dw4nn")
_followNode = NodePath("../Vesna/CharacterBody2D")
[node name="CanvasLayer" parent="." instance=ExtResource("24_yd2gv")]
[connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room01PechkaDoor/InteractionArea" method="ToggleActive"]
[connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room assets/hand" method="PlayAnimation"]
[connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="." method="Quit"]
[connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="Yeli/Beetroot Quest trigger" method="Trigger"]
[editable path="BackWall/Room01PechkaDoor/InteractionArea"]
[editable path="Vesna"]

Loading…
Cancel
Save