diff --git a/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png new file mode 100644 index 00000000..72dbb6fe --- /dev/null +++ b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1839e2207c80a1293ac75eceb08bed40dc18e6342c15f1df6f79a9759332c074 +size 1078 diff --git a/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png.import b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png.import new file mode 100644 index 00000000..e95528f5 --- /dev/null +++ b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://di1mfjeb1emj8" +path="res://.godot/imported/MuzzleFlashIntro.png-654dbbc8bd8c8144908ab02a2072ff40.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png" +dest_files=["res://.godot/imported/MuzzleFlashIntro.png-654dbbc8bd8c8144908ab02a2072ff40.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 diff --git a/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.pxc b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.pxc new file mode 100644 index 00000000..b346dd1a Binary files /dev/null and b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.pxc differ diff --git a/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.pxc1 b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.pxc1 new file mode 100644 index 00000000..352209ba Binary files /dev/null and b/ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.pxc1 differ diff --git a/Scenes/Cutscenes/Intro.tscn b/Scenes/Cutscenes/Intro.tscn index 4b44c7ec..18f1a641 100644 --- a/Scenes/Cutscenes/Intro.tscn +++ b/Scenes/Cutscenes/Intro.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=88 format=3 uid="uid://oaxftu6lytvv"] +[gd_scene load_steps=94 format=3 uid="uid://oaxftu6lytvv"] [ext_resource type="Script" uid="uid://d1cxthcj2fc10" path="res://Scripts/UI/IntroScenePlayer.cs" id="1_jtu71"] [ext_resource type="Texture2D" uid="uid://4skj5ik6qpu4" path="res://Sprites/Briefing/Intro1small.png" id="2_6u3to"] @@ -64,6 +64,10 @@ [ext_resource type="Texture2D" uid="uid://d06483xi11poy" path="res://Sprites/Briefing/Intro/robot pov/l0_robot pov1.png" id="58_dgmlk"] [ext_resource type="Texture2D" uid="uid://cv1fmski5dvhk" path="res://Sprites/Briefing/Intro/robot pov/l1_robot pov1.png" id="59_5r400"] [ext_resource type="Texture2D" uid="uid://cyh6fv64v1y0f" path="res://Sprites/Briefing/Intro/robot pov/l2_robot pov1.png" id="60_2bgr7"] +[ext_resource type="Texture2D" uid="uid://di1mfjeb1emj8" path="res://ExternalMaterial/MuzzleFlashIntro/MuzzleFlashIntro.png" id="61_5r400"] +[ext_resource type="Texture2D" uid="uid://djj3ferfa5mwv" path="res://Sprites/Briefing/Intro/robot pov/l2_robot pov2.png" id="61_qihmg"] +[ext_resource type="Script" uid="uid://w85hem1ec8cq" path="res://Scripts/Tools/AnimatedTextureRect.gd" id="62_8b3n1"] +[ext_resource type="Texture2D" uid="uid://burwdwv732smb" path="res://Sprites/Briefing/Intro/robot pov/l2_robot pov3.png" id="63_eb5k1"] [sub_resource type="Gradient" id="Gradient_k5r5b"] colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1) @@ -148,7 +152,7 @@ tracks/5/keys = { [sub_resource type="Animation" id="Animation_cvfpi"] resource_name = "forest_pan" -length = 3.0 +length = 4.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -216,10 +220,10 @@ tracks/5/path = NodePath(".:modulate") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0, 0.466667), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(0, 0.466667, 3.4, 3.66667), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, -"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] +"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_yr5qh"] @@ -308,18 +312,46 @@ angle_max = 145.5 gravity = Vector3(0, 0, 0) scale_min = 0.6 +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_dgmlk"] +particle_flag_disable_z = true +angle_min = -231.0 +angle_max = 271.8 +spread = 180.0 +initial_velocity_min = 98.48 +initial_velocity_max = 141.77 +gravity = Vector3(0, 0, 0) +linear_accel_min = 16.9 +linear_accel_max = 60.38 + +[sub_resource type="SpriteFrames" id="SpriteFrames_cq8x2"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("60_2bgr7") +}, { +"duration": 1.0, +"texture": ExtResource("61_qihmg") +}, { +"duration": 1.0, +"texture": ExtResource("63_eb5k1") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_mf5e4"] shader = ExtResource("6_xs4jm") shader_parameter/screen_width = 1024.0 shader_parameter/screen_height = 600.0 shader_parameter/BarrelPower = 1.0 shader_parameter/color_bleeding = 0.265 -shader_parameter/bleeding_range_x = 2.845 -shader_parameter/bleeding_range_y = 2.64 -shader_parameter/lines_distance = 4.0 -shader_parameter/scan_size = 2.0 -shader_parameter/scanline_alpha = 0.9 -shader_parameter/lines_velocity = 30.0 +shader_parameter/bleeding_range_x = 1.235 +shader_parameter/bleeding_range_y = -0.01 +shader_parameter/lines_distance = 2.0 +shader_parameter/scan_size = 3.105 +shader_parameter/scanline_alpha = 0.94 +shader_parameter/lines_velocity = 23.6 [sub_resource type="Gradient" id="Gradient_dgmlk"] colors = PackedColorArray(1, 0.984314, 1, 1, 1, 1, 1, 1) @@ -640,6 +672,30 @@ tracks/25/keys = { "update": 1, "values": [true] } +tracks/26/type = "value" +tracks/26/imported = false +tracks/26/enabled = true +tracks/26/path = NodePath("MarginContainer/ImagesContainer/Intro11/CrystalEmitter:emitting") +tracks/26/interp = 1 +tracks/26/loop_wrap = true +tracks/26/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} +tracks/27/type = "value" +tracks/27/imported = false +tracks/27/enabled = true +tracks/27/path = NodePath("MarginContainer/ImagesContainer/CirnoReforming/CirnoReformingTexture:position") +tracks/27/interp = 1 +tracks/27/loop_wrap = true +tracks/27/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} [sub_resource type="Animation" id="Animation_d4oe4"] resource_name = "intro" @@ -767,7 +823,7 @@ tracks/9/keys = { tracks/10/type = "value" tracks/10/imported = false tracks/10/enabled = true -tracks/10/path = NodePath("MarginContainer/ImagesContainer/Intro12:modulate") +tracks/10/path = NodePath("MarginContainer/ImagesContainer/CirnoReforming:modulate") tracks/10/interp = 1 tracks/10/loop_wrap = true tracks/10/keys = { @@ -1093,6 +1149,30 @@ tracks/36/keys = { "clips": PackedStringArray("forest_pan"), "times": PackedFloat32Array(0) } +tracks/37/type = "value" +tracks/37/imported = false +tracks/37/enabled = true +tracks/37/path = NodePath("MarginContainer/ImagesContainer/Intro11/CrystalEmitter:emitting") +tracks/37/interp = 1 +tracks/37/loop_wrap = true +tracks/37/keys = { +"times": PackedFloat32Array(10.7333, 23.2859), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [false, true] +} +tracks/38/type = "value" +tracks/38/imported = false +tracks/38/enabled = true +tracks/38/path = NodePath("MarginContainer/ImagesContainer/CirnoReforming/CirnoReformingTexture:position") +tracks/38/interp = 1 +tracks/38/loop_wrap = true +tracks/38/keys = { +"times": PackedFloat32Array(24.1667, 28.6333), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0, -26.79), Vector2(0, 10.15)] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_p86nr"] _data = { @@ -1258,6 +1338,7 @@ texture = ExtResource("31_mqbwl") stretch_mode = 5 [node name="Intro7" type="TextureRect" parent="MarginContainer/ImagesContainer"] +modulate = Color(1, 1, 1, 0) layout_mode = 2 texture = ExtResource("35_gbvvb") stretch_mode = 5 @@ -1281,6 +1362,7 @@ offset_bottom = 40.0 texture = ExtResource("38_kkn1r") [node name="Intro8" type="TextureRect" parent="MarginContainer/ImagesContainer"] +modulate = Color(1, 1, 1, 0) layout_mode = 2 texture = ExtResource("39_4d10p") stretch_mode = 5 @@ -1298,6 +1380,7 @@ offset_bottom = 40.0 texture = ExtResource("41_bsyaq") [node name="Intro9" type="TextureRect" parent="MarginContainer/ImagesContainer"] +modulate = Color(1, 1, 1, 0) clip_contents = true layout_mode = 2 texture = ExtResource("42_oui7j") @@ -1323,6 +1406,7 @@ offset_bottom = 100.0 texture = ExtResource("45_8f1jm") [node name="Intro10" type="TextureRect" parent="MarginContainer/ImagesContainer"] +modulate = Color(1, 1, 1, 0) clip_contents = true layout_mode = 2 texture = ExtResource("42_oui7j") @@ -1357,7 +1441,7 @@ texture = ExtResource("35_lrnvt") process_material = SubResource("ParticleProcessMaterial_6n1fx") [node name="Intro11" type="TextureRect" parent="MarginContainer/ImagesContainer"] -modulate = Color(1, 1, 1, 0.870762) +modulate = Color(1, 1, 1, 0) clip_contents = true layout_mode = 2 texture = ExtResource("50_kkn1r") @@ -1378,18 +1462,32 @@ offset_right = 40.0 offset_bottom = 40.0 texture = ExtResource("52_2p1cn") -[node name="Intro12" type="TextureRect" parent="MarginContainer/ImagesContainer"] +[node name="CrystalEmitter" type="GPUParticles2D" parent="MarginContainer/ImagesContainer/Intro11"] +position = Vector2(83.5956, 43.464) +emitting = false +amount = 64 +texture = ExtResource("51_4d10p") +process_material = SubResource("ParticleProcessMaterial_dgmlk") + +[node name="CirnoReforming" type="TextureRect" parent="MarginContainer/ImagesContainer"] modulate = Color(1, 1, 1, 0) +clip_contents = true layout_mode = 2 texture = ExtResource("53_oui7j") stretch_mode = 5 -[node name="TextureRect" type="TextureRect" parent="MarginContainer/ImagesContainer/Intro12"] +[node name="CirnoReformingTexture" type="TextureRect" parent="MarginContainer/ImagesContainer/CirnoReforming"] layout_mode = 0 -offset_right = 40.0 -offset_bottom = 40.0 +offset_right = 130.0 +offset_bottom = 100.0 texture = ExtResource("54_bqvt7") +[node name="CrystalEmitter2" type="GPUParticles2D" parent="MarginContainer/ImagesContainer/CirnoReforming/CirnoReformingTexture"] +position = Vector2(63.7495, 44.7237) +amount = 64 +texture = ExtResource("51_4d10p") +process_material = SubResource("ParticleProcessMaterial_dgmlk") + [node name="Intro13" type="TextureRect" parent="MarginContainer/ImagesContainer"] modulate = Color(1, 1, 1, 0) layout_mode = 2 @@ -1419,18 +1517,36 @@ offset_right = 40.0 offset_bottom = 40.0 texture = ExtResource("59_5r400") -[node name="TextureRect2" type="TextureRect" parent="MarginContainer/ImagesContainer/Intro14"] +[node name="RobotUI" type="TextureRect" parent="MarginContainer/ImagesContainer/Intro14"] +visible = false layout_mode = 0 offset_right = 40.0 offset_bottom = 40.0 texture = ExtResource("60_2bgr7") +[node name="AnimatedTextureRect" type="TextureRect" parent="MarginContainer/ImagesContainer/Intro14"] +layout_mode = 0 +offset_right = 40.0 +offset_bottom = 40.0 +texture = ExtResource("61_qihmg") +script = ExtResource("62_8b3n1") +Frames = SubResource("SpriteFrames_cq8x2") +metadata/_custom_type_script = "uid://w85hem1ec8cq" + [node name="Intro15" type="TextureRect" parent="MarginContainer/ImagesContainer"] modulate = Color(1, 1, 1, 0) layout_mode = 2 -texture = ExtResource("16_augg6") +texture = ExtResource("59_5r400") stretch_mode = 5 +[node name="TextureRect" type="TextureRect" parent="MarginContainer/ImagesContainer/Intro15"] +layout_mode = 0 +offset_left = 19.76 +offset_top = 13.165 +offset_right = 83.76 +offset_bottom = 77.165 +texture = ExtResource("61_5r400") + [node name="CRT" type="TextureRect" parent="MarginContainer"] material = SubResource("ShaderMaterial_mf5e4") layout_mode = 2