diff --git a/Dialogue/Timelines/Mission1_Briefing.dtl b/Dialogue/Timelines/Mission1_Briefing.dtl new file mode 100644 index 00000000..8cb1f305 --- /dev/null +++ b/Dialogue/Timelines/Mission1_Briefing.dtl @@ -0,0 +1,4 @@ +[style name="VN"] +Welcome to the Resistance, Cirno. +[background arg="res://Sprites/Briefing/Refinery.png" fade="0.0"] +This is your objective diff --git a/Scenes/Actors/Tanky.tscn b/Scenes/Actors/Tanky.tscn new file mode 100644 index 00000000..cfbfc1e3 --- /dev/null +++ b/Scenes/Actors/Tanky.tscn @@ -0,0 +1,106 @@ +[gd_scene load_steps=14 format=3 uid="uid://dbgvy5enatg0y"] + +[ext_resource type="Script" path="res://Scripts/Enemy.cs" id="1_7e83j"] +[ext_resource type="Texture2D" uid="uid://b7kwstavr73pe" path="res://Sprites/Actors/Robot2.png" id="2_r1g2v"] +[ext_resource type="Script" path="res://Scripts/Components/ProximityPlayerDetection.cs" id="3_75mq7"] +[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="4_0ryiv"] +[ext_resource type="Resource" uid="uid://cdfmedtgp2rcn" path="res://Resources/Weapons/EnemyWeapon.tres" id="5_rp2iv"] +[ext_resource type="PackedScene" uid="uid://cuixq5ex0j40h" path="res://Scenes/enemyBullet.tscn" id="6_ol05d"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_s1iwv"] +atlas = ExtResource("2_r1g2v") +region = Rect2(0, 0, 16, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dan4u"] +atlas = ExtResource("2_r1g2v") +region = Rect2(16, 0, 16, 32) + +[sub_resource type="SpriteFrames" id="SpriteFrames_q3w3x"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_s1iwv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_dan4u") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="CircleShape2D" id="CircleShape2D_8gtts"] +radius = 7.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_cacb5"] +radius = 4.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_v711r"] +radius = 85.0529 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_m1rsg"] +size = Vector2(8, 12) + +[node name="Enemy" type="CharacterBody2D" node_paths=PackedStringArray("EquippedWeapon", "_playerDetection") groups=["Destroyable"]] +collision_layer = 16 +collision_mask = 9 +script = ExtResource("1_7e83j") +Health = 8.0 +WalkSpeed = 1000.0 +AlarmReactRange = 50.0 +EquippedWeapon = NodePath("Weapon") +_playerDetection = NodePath("PlayerDetection") +_navigationEnabled = true +metadata/_edit_group_ = true + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_q3w3x") + +[node name="Damage_HitBox" type="CollisionShape2D" parent="."] +visible = false +shape = SubResource("CircleShape2D_8gtts") + +[node name="RigidBody2D" type="RigidBody2D" parent="."] +collision_layer = 16 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +visible = false +position = Vector2(0, 5) +shape = SubResource("CircleShape2D_cacb5") + +[node name="PlayerDetection" type="Area2D" parent="."] +visible = false +collision_layer = 16 +collision_mask = 2 +script = ExtResource("3_75mq7") + +[node name="PlayerDetectionArea" type="CollisionShape2D" parent="PlayerDetection"] +shape = SubResource("CircleShape2D_v711r") + +[node name="ShootTimer" type="Timer" parent="."] +wait_time = 0.4 +one_shot = true + +[node name="Weapon" parent="." instance=ExtResource("4_0ryiv")] +WeaponData = ExtResource("5_rp2iv") +BulletScene = ExtResource("6_ol05d") + +[node name="NavigationAgent2D" type="NavigationAgent2D" parent="."] +target_desired_distance = 64.0 +path_max_distance = 800.0 +path_postprocessing = 1 +avoidance_enabled = true +debug_enabled = true +debug_path_custom_color = Color(1, 0, 0, 1) + +[node name="DamageHitbox" type="Area2D" parent="."] +collision_layer = 16 +collision_mask = 9 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="DamageHitbox"] +shape = SubResource("RectangleShape2D_m1rsg") + +[connection signal="area_entered" from="PlayerDetection" to="PlayerDetection" method="_on_area_entered"] +[connection signal="area_exited" from="PlayerDetection" to="PlayerDetection" method="_on_area_exited"] +[connection signal="velocity_computed" from="NavigationAgent2D" to="." method="_on_navigation_agent_2d_velocity_computed"] +[connection signal="area_entered" from="DamageHitbox" to="." method="_on_damage_hitbox_area_entered"] diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 4e5ba356..12ee00c2 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=68 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=69 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"] @@ -67,6 +67,11 @@ script = ExtResource("52_5m7td") Target = NodePath("../../Enemy15") WaitForCompletion = true +[sub_resource type="Resource" id="Resource_s3g2w"] +script = ExtResource("46_i0omr") +TimelineName = "Mission1_Briefing" +WaitForCompletion = true + [sub_resource type="Resource" id="Resource_068l7"] script = ExtResource("46_i0omr") TimelineName = "rumia_defeat" @@ -494,6 +499,22 @@ Target = NodePath("Node2D") script = ExtResource("42_wigyb") Events = Array[Object]([SubResource("Resource_hdht4")]) +[node name="Computer4" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] +position = Vector2(-791, -505) +Target = NodePath("Node2D") + +[node name="Node2D" type="Node2D" parent="Computer4"] +script = ExtResource("42_wigyb") +Events = Array[Object]([SubResource("Resource_s3g2w")]) + +[node name="Label" type="Label" parent="Computer4"] +offset_left = -5.0 +offset_top = -21.0 +offset_right = 39.0 +offset_bottom = 2.0 +text = "Briefing Test" +label_settings = ExtResource("14_c4c20") + [node name="Ammo1" parent="." instance=ExtResource("34_17pjh")] position = Vector2(-792, -396) diff --git a/Sprites/Actors/Robot3.aseprite b/Sprites/Actors/Robot3.aseprite new file mode 100644 index 00000000..482aa992 --- /dev/null +++ b/Sprites/Actors/Robot3.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72b1858a6b6549a92dc55534e2f0a70b135667757b82a0d25e1a2f1dbabedfc1 +size 5745 diff --git a/Sprites/Actors/Robot3.png b/Sprites/Actors/Robot3.png new file mode 100644 index 00000000..fc8fb2fc --- /dev/null +++ b/Sprites/Actors/Robot3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8337181700f61234a1dfcbc36ef8be34869b140d59b67e6a49b90e6a4102c35 +size 1559 diff --git a/Sprites/Actors/Robot3.png.import b/Sprites/Actors/Robot3.png.import new file mode 100644 index 00000000..87acab2d --- /dev/null +++ b/Sprites/Actors/Robot3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://hukxr2e63gky" +path="res://.godot/imported/Robot3.png-8764709a27aa2ee822515d363f372ad3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Actors/Robot3.png" +dest_files=["res://.godot/imported/Robot3.png-8764709a27aa2ee822515d363f372ad3.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/Sprites/Briefing/Refinery.png b/Sprites/Briefing/Refinery.png new file mode 100644 index 00000000..9a8ecfec --- /dev/null +++ b/Sprites/Briefing/Refinery.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53abd3e1d6177aa9e2d2f72a73c63ffc45e448cd87b1d4b1a5da5b10cc4ef53a +size 82882 diff --git a/Sprites/Briefing/Refinery.png.import b/Sprites/Briefing/Refinery.png.import new file mode 100644 index 00000000..5c84d4ce --- /dev/null +++ b/Sprites/Briefing/Refinery.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7nsfpo1unw7l" +path="res://.godot/imported/Refinery.png-2c0c61525aabc824ec0a8afe9355afa0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Briefing/Refinery.png" +dest_files=["res://.godot/imported/Refinery.png-2c0c61525aabc824ec0a8afe9355afa0.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/project.godot b/project.godot index 47c32647..c39c3254 100644 --- a/project.godot +++ b/project.godot @@ -40,6 +40,7 @@ directories/dch_directory={ "computer": "res://Dialogue/Characters/computer.dch" } directories/dtl_directory={ +"Mission1_Briefing": "res://Dialogue/Timelines/Mission1_Briefing.dtl", "Rumia_Intro": "res://Dialogue/Timelines/Rumia_Intro.dtl", "computer1": "res://Dialogue/Timelines/computer1.dtl", "computer2": "res://Dialogue/Timelines/computer2.dtl",