TeaSanctuary/chill-jam-10-2024
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Прогрессия 7

Browse source
This commit is contained in:
Евгений Титаренко 2024-08-25 20:37:57 +03:00
parent bc6c8934e7
commit 52ce703697
7 changed files with 479 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
prefabs/Player.tscn
View file

@ -52,7 +52,7 @@ script = ExtResource("1_68nsf")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
texture_filter = 1
sprite_frames = ExtResource("1_be2ex")
animation = &"walk"
frame_progress = 0.0128934
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, -0.5)

59
resources/sprites/player/player.tres
View file

@ -1,11 +1,40 @@
[gd_resource type="SpriteFrames" load_steps=11 format=3 uid="uid://e8ybb7seykdx"]
[gd_resource type="SpriteFrames" load_steps=19 format=3 uid="uid://e8ybb7seykdx"]
[ext_resource type="Texture2D" uid="uid://c50svxafnldco" path="res://resources/sprites/player/player.png" id="1_dm8qi"]
[ext_resource type="Texture2D" uid="uid://dnfl5s2jomppo" path="res://resources/sprites/player/main.png" id="2_u64dd"]
[sub_resource type="AtlasTexture" id="AtlasTexture_1e4dj"]
atlas = ExtResource("1_dm8qi")
region = Rect2(0, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_yhnkw"]
atlas = ExtResource("2_u64dd")
region = Rect2(64, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_t773d"]
atlas = ExtResource("2_u64dd")
region = Rect2(128, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_jtt6x"]
atlas = ExtResource("2_u64dd")
region = Rect2(192, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_s6u4e"]
atlas = ExtResource("2_u64dd")
region = Rect2(256, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_nxmti"]
atlas = ExtResource("2_u64dd")
region = Rect2(320, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_s1irt"]
atlas = ExtResource("2_u64dd")
region = Rect2(384, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_at6o4"]
atlas = ExtResource("2_u64dd")
region = Rect2(448, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_plu4p"]
atlas = ExtResource("1_dm8qi")
region = Rect2(64, 0, 64, 64)
@ -50,6 +79,32 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_yhnkw")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_t773d")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jtt6x")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_s6u4e")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_nxmti")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_s1irt")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_at6o4")
}],
"loop": true,
"name": &"walk",
"speed": 13.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_plu4p")
}, {
"duration": 1.0,
@ -74,6 +129,6 @@ animations = [{
"texture": SubResource("AtlasTexture_vm47t")
}],
"loop": true,
"name": &"walk",
"name": &"walk2",
"speed": 14.0
}]

9
scenes/Day2.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=26 format=3 uid="uid://bpnc0noa6do5m"]
[gd_scene load_steps=27 format=3 uid="uid://bpnc0noa6do5m"]
[ext_resource type="Script" path="res://scripts/Day.cs" id="1_6vltc"]
[ext_resource type="Texture2D" uid="uid://b5baxx5o21qy1" path="res://resources/sprites/Sub/Sub.png" id="1_j1x6m"]
@ -10,6 +10,7 @@
[ext_resource type="SpriteFrames" uid="uid://532buo56y4q2" path="res://resources/sprites/npcs/crewmate.tres" id="7_0mkl0"]
[ext_resource type="SpriteFrames" uid="uid://wu7pmuvjw5qm" path="res://resources/sprites/npcs/Empty.tres" id="8_1sqr2"]
[ext_resource type="PackedScene" uid="uid://dfdsnwub212o6" path="res://prefabs/Player.tscn" id="9_7dj1v"]
[ext_resource type="Texture2D" uid="uid://41c7sdjkinml" path="res://resources/sprites/barns/corrupt16.png" id="10_1ls1k"]
[ext_resource type="AudioStream" uid="uid://bask8dw8kd56j" path="res://resources/music/Day2.wav" id="10_x821k"]
[ext_resource type="AudioStream" uid="uid://djbidtsatly0u" path="res://resources/sounds/nightmares/D2nm.wav" id="12_c16wp"]
[ext_resource type="PackedScene" uid="uid://x6pqolxtgwvy" path="res://prefabs/Interactable.tscn" id="12_f7yho"]
@ -248,6 +249,12 @@ NPCName = "Bridge door"
Frames = ExtResource("8_1sqr2")
DefaultDialogLine = "Looks like the door is closed from the other side"
[node name="Deco" type="Node2D" parent="."]
[node name="Barn" type="Sprite2D" parent="Deco"]
position = Vector2(1037, 31)
texture = ExtResource("10_1ls1k")
[node name="Player" parent="." instance=ExtResource("9_7dj1v")]
position = Vector2(1054, 255)
Speed = 100.0

58
scenes/Day3.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=26 format=3 uid="uid://dydhxm41f4kqu"]
[gd_scene load_steps=28 format=3 uid="uid://dydhxm41f4kqu"]
[ext_resource type="Script" path="res://scripts/Day.cs" id="1_6ouk8"]
[ext_resource type="Texture2D" uid="uid://b5baxx5o21qy1" path="res://resources/sprites/Sub/Sub.png" id="1_m7xoy"]
@ -10,7 +10,9 @@
[ext_resource type="SpriteFrames" uid="uid://532buo56y4q2" path="res://resources/sprites/npcs/crewmate.tres" id="7_l8k40"]
[ext_resource type="SpriteFrames" uid="uid://wu7pmuvjw5qm" path="res://resources/sprites/npcs/Empty.tres" id="8_k42bg"]
[ext_resource type="PackedScene" uid="uid://dfdsnwub212o6" path="res://prefabs/Player.tscn" id="9_pvv3u"]
[ext_resource type="Texture2D" uid="uid://bu7tporh3nk4s" path="res://resources/sprites/barns/corrupt32.png" id="10_1vl5d"]
[ext_resource type="AudioStream" uid="uid://c0mheqx5d738m" path="res://resources/music/Day3.wav" id="10_ouee8"]
[ext_resource type="Texture2D" uid="uid://41c7sdjkinml" path="res://resources/sprites/barns/corrupt16.png" id="11_tpmf6"]
[ext_resource type="AudioStream" uid="uid://cthbe23g2r01q" path="res://resources/sounds/nightmares/D3nm.wav" id="12_jru5s"]
[ext_resource type="PackedScene" uid="uid://x6pqolxtgwvy" path="res://prefabs/Interactable.tscn" id="12_yeat3"]
@ -248,6 +250,60 @@ NPCName = "Bridge door"
Frames = ExtResource("8_k42bg")
DefaultDialogLine = "Still closed"
[node name="Deco" type="Node2D" parent="."]
[node name="Barn" type="Sprite2D" parent="Deco"]
position = Vector2(1030, 26)
texture = ExtResource("10_1vl5d")
[node name="Barn2" type="Sprite2D" parent="Deco"]
position = Vector2(886, 140)
texture = ExtResource("11_tpmf6")
[node name="Barn13" type="Sprite2D" parent="Deco"]
position = Vector2(871, -30)
texture = ExtResource("11_tpmf6")
[node name="Barn6" type="Sprite2D" parent="Deco"]
position = Vector2(1708, 91)
texture = ExtResource("11_tpmf6")
[node name="Barn7" type="Sprite2D" parent="Deco"]
position = Vector2(1708, -30)
texture = ExtResource("11_tpmf6")
[node name="Barn3" type="Sprite2D" parent="Deco"]
position = Vector2(1075, 98)
texture = ExtResource("11_tpmf6")
[node name="Barn5" type="Sprite2D" parent="Deco"]
position = Vector2(1520, 211)
texture = ExtResource("11_tpmf6")
[node name="Barn4" type="Sprite2D" parent="Deco"]
position = Vector2(576, 209)
texture = ExtResource("11_tpmf6")
[node name="Barn8" type="Sprite2D" parent="Deco"]
position = Vector2(-17, 26)
texture = ExtResource("11_tpmf6")
[node name="Barn9" type="Sprite2D" parent="Deco"]
position = Vector2(-467, 12)
texture = ExtResource("11_tpmf6")
[node name="Barn10" type="Sprite2D" parent="Deco"]
position = Vector2(-197, 6)
texture = ExtResource("11_tpmf6")
[node name="Barn11" type="Sprite2D" parent="Deco"]
position = Vector2(-417, 72)
texture = ExtResource("11_tpmf6")
[node name="Barn12" type="Sprite2D" parent="Deco"]
position = Vector2(-100, 45)
texture = ExtResource("11_tpmf6")
[node name="Player" parent="." instance=ExtResource("9_pvv3u")]
position = Vector2(1054, 255)
Speed = 100.0

127
scenes/Day4.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=26 format=3 uid="uid://cxvsyen213g1o"]
[gd_scene load_steps=28 format=3 uid="uid://cxvsyen213g1o"]
[ext_resource type="Script" path="res://scripts/Day.cs" id="1_gb313"]
[ext_resource type="Texture2D" uid="uid://b5baxx5o21qy1" path="res://resources/sprites/Sub/Sub.png" id="1_ngvqc"]
@ -11,6 +11,8 @@
[ext_resource type="SpriteFrames" uid="uid://wu7pmuvjw5qm" path="res://resources/sprites/npcs/Empty.tres" id="8_je535"]
[ext_resource type="PackedScene" uid="uid://dfdsnwub212o6" path="res://prefabs/Player.tscn" id="9_qlkfx"]
[ext_resource type="AudioStream" uid="uid://dyj3161xr78j8" path="res://resources/music/Day4.wav" id="10_vlywc"]
[ext_resource type="Texture2D" uid="uid://bu7tporh3nk4s" path="res://resources/sprites/barns/corrupt32.png" id="10_yr64q"]
[ext_resource type="Texture2D" uid="uid://41c7sdjkinml" path="res://resources/sprites/barns/corrupt16.png" id="11_o25d6"]
[ext_resource type="PackedScene" uid="uid://x6pqolxtgwvy" path="res://prefabs/Interactable.tscn" id="12_dvtmm"]
[ext_resource type="AudioStream" uid="uid://71paty3fjbq8" path="res://resources/sounds/nightmares/D4nm.wav" id="12_lqcqa"]
@ -248,7 +250,130 @@ NPCName = "Bridge door"
Frames = ExtResource("8_je535")
DefaultDialogLine = "You feel that you will meet captain soon"
[node name="Deco" type="Node2D" parent="."]
[node name="Barn" type="Sprite2D" parent="Deco"]
position = Vector2(1030, 26)
texture = ExtResource("10_yr64q")
[node name="Barn26" type="Sprite2D" parent="Deco"]
position = Vector2(1007, 25)
texture = ExtResource("10_yr64q")
[node name="Barn2" type="Sprite2D" parent="Deco"]
position = Vector2(885, 130)
texture = ExtResource("10_yr64q")
[node name="Barn13" type="Sprite2D" parent="Deco"]
position = Vector2(871, -30)
texture = ExtResource("11_o25d6")
[node name="Barn16" type="Sprite2D" parent="Deco"]
position = Vector2(254, -30)
texture = ExtResource("11_o25d6")
[node name="Barn27" type="Sprite2D" parent="Deco"]
position = Vector2(-127, 202)
texture = ExtResource("11_o25d6")
[node name="Barn28" type="Sprite2D" parent="Deco"]
position = Vector2(-149, 255)
texture = ExtResource("11_o25d6")
[node name="Barn17" type="Sprite2D" parent="Deco"]
position = Vector2(310, -30)
texture = ExtResource("11_o25d6")
[node name="Barn18" type="Sprite2D" parent="Deco"]
position = Vector2(384, -1)
texture = ExtResource("11_o25d6")
[node name="Barn6" type="Sprite2D" parent="Deco"]
position = Vector2(1708, 91)
texture = ExtResource("11_o25d6")
[node name="Barn7" type="Sprite2D" parent="Deco"]
position = Vector2(1708, -30)
texture = ExtResource("11_o25d6")
[node name="Barn29" type="Sprite2D" parent="Deco"]
position = Vector2(1577, -31)
texture = ExtResource("11_o25d6")
[node name="Barn30" type="Sprite2D" parent="Deco"]
position = Vector2(1460, 32)
texture = ExtResource("11_o25d6")
[node name="Barn3" type="Sprite2D" parent="Deco"]
position = Vector2(1075, 98)
texture = ExtResource("10_yr64q")
[node name="Barn5" type="Sprite2D" parent="Deco"]
position = Vector2(1520, 211)
texture = ExtResource("11_o25d6")
[node name="Barn14" type="Sprite2D" parent="Deco"]
position = Vector2(1519, 269)
texture = ExtResource("11_o25d6")
[node name="Barn4" type="Sprite2D" parent="Deco"]
position = Vector2(576, 209)
texture = ExtResource("11_o25d6")
[node name="Barn15" type="Sprite2D" parent="Deco"]
position = Vector2(1241, 206)
texture = ExtResource("11_o25d6")
[node name="Barn8" type="Sprite2D" parent="Deco"]
position = Vector2(-17, 26)
texture = ExtResource("10_yr64q")
[node name="Barn9" type="Sprite2D" parent="Deco"]
position = Vector2(-467, 12)
texture = ExtResource("10_yr64q")
[node name="Barn10" type="Sprite2D" parent="Deco"]
position = Vector2(-197, 6)
texture = ExtResource("10_yr64q")
[node name="Barn11" type="Sprite2D" parent="Deco"]
position = Vector2(-417, 72)
texture = ExtResource("10_yr64q")
[node name="Barn19" type="Sprite2D" parent="Deco"]
position = Vector2(-229, 69)
texture = ExtResource("10_yr64q")
[node name="Barn20" type="Sprite2D" parent="Deco"]
position = Vector2(-209, 86)
texture = ExtResource("10_yr64q")
[node name="Barn21" type="Sprite2D" parent="Deco"]
position = Vector2(-201, 61)
texture = ExtResource("10_yr64q")
[node name="Barn22" type="Sprite2D" parent="Deco"]
position = Vector2(-233, 92)
texture = ExtResource("10_yr64q")
[node name="Barn12" type="Sprite2D" parent="Deco"]
position = Vector2(-100, 45)
texture = ExtResource("10_yr64q")
[node name="Barn23" type="Sprite2D" parent="Deco"]
position = Vector2(-36, 134)
texture = ExtResource("10_yr64q")
[node name="Barn24" type="Sprite2D" parent="Deco"]
position = Vector2(-359, 131)
texture = ExtResource("10_yr64q")
[node name="Barn25" type="Sprite2D" parent="Deco"]
position = Vector2(-301, 40)
texture = ExtResource("10_yr64q")
[node name="Player" parent="." instance=ExtResource("9_qlkfx")]
visible = false
position = Vector2(1054, 255)
Speed = 100.0

227
scenes/Day5.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=25 format=3 uid="uid://10ew1xa1pxm2"]
[gd_scene load_steps=27 format=3 uid="uid://10ew1xa1pxm2"]
[ext_resource type="Script" path="res://scripts/Day.cs" id="1_ii8yu"]
[ext_resource type="Texture2D" uid="uid://b5baxx5o21qy1" path="res://resources/sprites/Sub/Sub.png" id="1_p4jcj"]
@ -9,6 +9,8 @@
[ext_resource type="SpriteFrames" uid="uid://532buo56y4q2" path="res://resources/sprites/npcs/crewmate.tres" id="7_vou74"]
[ext_resource type="SpriteFrames" uid="uid://wu7pmuvjw5qm" path="res://resources/sprites/npcs/Empty.tres" id="8_8y5k0"]
[ext_resource type="PackedScene" uid="uid://dfdsnwub212o6" path="res://prefabs/Player.tscn" id="9_mxxxl"]
[ext_resource type="Texture2D" uid="uid://bu7tporh3nk4s" path="res://resources/sprites/barns/corrupt32.png" id="9_uvt3y"]
[ext_resource type="Texture2D" uid="uid://41c7sdjkinml" path="res://resources/sprites/barns/corrupt16.png" id="10_52vj7"]
[ext_resource type="AudioStream" uid="uid://3poadcg4f8mj" path="res://resources/music/Day5.wav" id="10_bwdem"]
[ext_resource type="PackedScene" uid="uid://x6pqolxtgwvy" path="res://prefabs/Interactable.tscn" id="12_bvb3u"]
[ext_resource type="AudioStream" uid="uid://cw6y35jglsn1" path="res://resources/sounds/nightmares/D1nm.wav" id="12_thjn8"]
@ -232,6 +234,228 @@ Frames = ExtResource("8_8y5k0")
DefaultDialogLine = "Captain is waiting for you..."
DialogLines = ["Works at normal pace", "You try to stop it, but it doesnt still works", "Whatever is happening you need to see captain"]
[node name="Deco" type="Node2D" parent="."]
[node name="Barn" type="Sprite2D" parent="Deco"]
position = Vector2(1030, 26)
texture = ExtResource("9_uvt3y")
[node name="Barn26" type="Sprite2D" parent="Deco"]
position = Vector2(1007, 25)
texture = ExtResource("9_uvt3y")
[node name="Barn49" type="Sprite2D" parent="Deco"]
position = Vector2(1132, -278)
texture = ExtResource("9_uvt3y")
[node name="Barn52" type="Sprite2D" parent="Deco"]
position = Vector2(1132, -278)
texture = ExtResource("9_uvt3y")
[node name="Barn50" type="Sprite2D" parent="Deco"]
position = Vector2(1076, -296)
texture = ExtResource("9_uvt3y")
[node name="Barn39" type="Sprite2D" parent="Deco"]
position = Vector2(993, -53)
texture = ExtResource("9_uvt3y")
[node name="Barn2" type="Sprite2D" parent="Deco"]
position = Vector2(885, 130)
texture = ExtResource("9_uvt3y")
[node name="Barn32" type="Sprite2D" parent="Deco"]
position = Vector2(257, 269)
texture = ExtResource("9_uvt3y")
[node name="Barn13" type="Sprite2D" parent="Deco"]
position = Vector2(871, -30)
texture = ExtResource("10_52vj7")
[node name="Barn40" type="Sprite2D" parent="Deco"]
position = Vector2(922, 21)
texture = ExtResource("10_52vj7")
[node name="Barn41" type="Sprite2D" parent="Deco"]
position = Vector2(925, -24)
texture = ExtResource("10_52vj7")
[node name="Barn42" type="Sprite2D" parent="Deco"]
position = Vector2(917, -137)
texture = ExtResource("10_52vj7")
[node name="Barn43" type="Sprite2D" parent="Deco"]
position = Vector2(1027, -35)
texture = ExtResource("10_52vj7")
[node name="Barn44" type="Sprite2D" parent="Deco"]
position = Vector2(988, -104)
texture = ExtResource("10_52vj7")
[node name="Barn48" type="Sprite2D" parent="Deco"]
position = Vector2(924, -107)
texture = ExtResource("10_52vj7")
[node name="Barn45" type="Sprite2D" parent="Deco"]
position = Vector2(961, -160)
texture = ExtResource("10_52vj7")
[node name="Barn51" type="Sprite2D" parent="Deco"]
position = Vector2(836, -305)
texture = ExtResource("10_52vj7")
[node name="Barn53" type="Sprite2D" parent="Deco"]
position = Vector2(834, -242)
texture = ExtResource("10_52vj7")
[node name="Barn54" type="Sprite2D" parent="Deco"]
position = Vector2(1058, -242)
texture = ExtResource("10_52vj7")
[node name="Barn46" type="Sprite2D" parent="Deco"]
position = Vector2(1033, -180)
texture = ExtResource("10_52vj7")
[node name="Barn47" type="Sprite2D" parent="Deco"]
position = Vector2(966, -135)
texture = ExtResource("10_52vj7")
[node name="Barn16" type="Sprite2D" parent="Deco"]
position = Vector2(254, -25)
texture = ExtResource("9_uvt3y")
[node name="Barn31" type="Sprite2D" parent="Deco"]
position = Vector2(285, 28)
texture = ExtResource("9_uvt3y")
[node name="Barn55" type="Sprite2D" parent="Deco"]
position = Vector2(569, 16)
texture = ExtResource("9_uvt3y")
[node name="Barn27" type="Sprite2D" parent="Deco"]
position = Vector2(-127, 202)
texture = ExtResource("9_uvt3y")
[node name="Barn36" type="Sprite2D" parent="Deco"]
position = Vector2(-311, 254)
texture = ExtResource("9_uvt3y")
[node name="Barn28" type="Sprite2D" parent="Deco"]
position = Vector2(-143, 254)
texture = ExtResource("9_uvt3y")
[node name="Barn17" type="Sprite2D" parent="Deco"]
position = Vector2(310, -30)
texture = ExtResource("10_52vj7")
[node name="Barn33" type="Sprite2D" parent="Deco"]
position = Vector2(314, 24)
texture = ExtResource("10_52vj7")
[node name="Barn34" type="Sprite2D" parent="Deco"]
position = Vector2(328, 27)
texture = ExtResource("10_52vj7")
[node name="Barn37" type="Sprite2D" parent="Deco"]
position = Vector2(-371, 224)
texture = ExtResource("10_52vj7")
[node name="Barn38" type="Sprite2D" parent="Deco"]
position = Vector2(-329, 224)
texture = ExtResource("10_52vj7")
[node name="Barn18" type="Sprite2D" parent="Deco"]
position = Vector2(384, -1)
texture = ExtResource("10_52vj7")
[node name="Barn6" type="Sprite2D" parent="Deco"]
position = Vector2(1708, 91)
texture = ExtResource("10_52vj7")
[node name="Barn7" type="Sprite2D" parent="Deco"]
position = Vector2(1708, -30)
texture = ExtResource("10_52vj7")
[node name="Barn29" type="Sprite2D" parent="Deco"]
position = Vector2(1577, -31)
texture = ExtResource("10_52vj7")
[node name="Barn30" type="Sprite2D" parent="Deco"]
position = Vector2(1460, 32)
texture = ExtResource("10_52vj7")
[node name="Barn3" type="Sprite2D" parent="Deco"]
position = Vector2(1075, 98)
texture = ExtResource("9_uvt3y")
[node name="Barn5" type="Sprite2D" parent="Deco"]
position = Vector2(1520, 211)
texture = ExtResource("10_52vj7")
[node name="Barn14" type="Sprite2D" parent="Deco"]
position = Vector2(1519, 269)
texture = ExtResource("10_52vj7")
[node name="Barn4" type="Sprite2D" parent="Deco"]
position = Vector2(576, 209)
texture = ExtResource("10_52vj7")
[node name="Barn15" type="Sprite2D" parent="Deco"]
position = Vector2(1241, 206)
texture = ExtResource("10_52vj7")
[node name="Barn8" type="Sprite2D" parent="Deco"]
position = Vector2(-17, 26)
texture = ExtResource("9_uvt3y")
[node name="Barn9" type="Sprite2D" parent="Deco"]
position = Vector2(-467, 12)
texture = ExtResource("9_uvt3y")
[node name="Barn10" type="Sprite2D" parent="Deco"]
position = Vector2(-197, 6)
texture = ExtResource("9_uvt3y")
[node name="Barn11" type="Sprite2D" parent="Deco"]
position = Vector2(-417, 72)
texture = ExtResource("9_uvt3y")
[node name="Barn19" type="Sprite2D" parent="Deco"]
position = Vector2(-229, 69)
texture = ExtResource("9_uvt3y")
[node name="Barn20" type="Sprite2D" parent="Deco"]
position = Vector2(-209, 86)
texture = ExtResource("9_uvt3y")
[node name="Barn21" type="Sprite2D" parent="Deco"]
position = Vector2(-201, 61)
texture = ExtResource("9_uvt3y")
[node name="Barn22" type="Sprite2D" parent="Deco"]
position = Vector2(-233, 92)
texture = ExtResource("9_uvt3y")
[node name="Barn12" type="Sprite2D" parent="Deco"]
position = Vector2(-100, 45)
texture = ExtResource("9_uvt3y")
[node name="Barn23" type="Sprite2D" parent="Deco"]
position = Vector2(-36, 134)
texture = ExtResource("9_uvt3y")
[node name="Barn24" type="Sprite2D" parent="Deco"]
position = Vector2(-359, 131)
texture = ExtResource("9_uvt3y")
[node name="Barn35" type="Sprite2D" parent="Deco"]
position = Vector2(-359, 131)
texture = ExtResource("9_uvt3y")
[node name="Barn25" type="Sprite2D" parent="Deco"]
position = Vector2(-301, 40)
texture = ExtResource("9_uvt3y")
[node name="Player" parent="." instance=ExtResource("9_mxxxl")]
position = Vector2(1054, 255)
Speed = 100.0
@ -262,3 +486,4 @@ AreaRadius = 20.0
position = Vector2(705, 533)
[connection signal="DialogEnded" from="NPCs/Captain" to="." method="ChangeDay"]
[connection signal="finished" from="Nightmare" to="." method="ChangeScene"]

8
scripts/Player.cs
View file

@ -172,21 +172,21 @@ public partial class Player : CharacterBody2D
break;
case State.Wait:
// _camera.Offset = _cameraDefaultPosition;
HideChatLog(delta);
HideChatLog(delta, 2);
break;
default:
throw new ArgumentOutOfRangeException();
}
}
private void HideChatLog(double delta)
private void HideChatLog(double delta, double transitionTime = CameraTransitionTime)
{
if (_camera.Offset != _cameraDefaultPosition)
{
if (_currentCameraTransitionTime < CameraTransitionTime)
if (_currentCameraTransitionTime < transitionTime)
{
_camera.Offset = _cameraChatLogPosition.Lerp(_cameraDefaultPosition,
(float)(_currentCameraTransitionTime * 1 / CameraTransitionTime));
(float)(_currentCameraTransitionTime * 1 / transitionTime));
_currentCameraTransitionTime += delta;
}
else