diff --git a/Characters/Doc.tscn b/Characters/Doc.tscn index cbd6f0e..6cedbb9 100644 --- a/Characters/Doc.tscn +++ b/Characters/Doc.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=3 uid="uid://dsr5kkbthpwpl"] +[gd_scene load_steps=33 format=3 uid="uid://d2skjvvx6fal0"] [ext_resource type="Script" path="res://Characters/Doc.cs" id="2_3elet"] [ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="2_5jxom"] @@ -12,7 +12,7 @@ [ext_resource type="Script" path="res://State/NPC/Doc/DocShungiteDartState.cs" id="8_1hoax"] [ext_resource type="Script" path="res://Items/Inventory.cs" id="8_r8ejq"] [ext_resource type="Script" path="res://State/NPC/Doc/DocExitState.cs" id="9_6com1"] -[ext_resource type="PackedScene" uid="uid://doiwdphocqlpo" path="res://Entities/ShungiteSpike.tscn" id="9_7kavk"] +[ext_resource type="PackedScene" uid="uid://djaljmco3xo4g" path="res://Entities/ShungiteDart.tscn" id="9_kthpr"] [ext_resource type="AudioStream" uid="uid://k6kpdj1kv0jg" path="res://Assets/Sounds/splat.ogg" id="9_stm0e"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_7n7iy"] @@ -240,7 +240,7 @@ NPC = NodePath("../..") script = ExtResource("8_1hoax") Duration = 8.0 AttackDuration = 1.0 -Projectile = ExtResource("9_7kavk") +Projectile = ExtResource("9_kthpr") ExitState = NodePath("../Exit") NPC = NodePath("../..") diff --git a/Entities/ShungiteSpike.cs b/Entities/ShungiteDart.cs similarity index 84% rename from Entities/ShungiteSpike.cs rename to Entities/ShungiteDart.cs index 63bc6ef..f6d0a29 100644 --- a/Entities/ShungiteSpike.cs +++ b/Entities/ShungiteDart.cs @@ -1,7 +1,7 @@ using Godot; namespace SupaLidlGame.Entities; -public partial class ShungiteSpike : Projectile +public partial class ShungiteDart : Projectile { public override void _Ready() { diff --git a/Entities/ShungiteSpike.tscn b/Entities/ShungiteDart.tscn similarity index 80% rename from Entities/ShungiteSpike.tscn rename to Entities/ShungiteDart.tscn index d7c8121..302dd9e 100644 --- a/Entities/ShungiteSpike.tscn +++ b/Entities/ShungiteDart.tscn @@ -1,136 +1,135 @@ -[gd_scene load_steps=42 format=3 uid="uid://doiwdphocqlpo"] +[gd_scene load_steps=41 format=3 uid="uid://djaljmco3xo4g"] -[ext_resource type="Script" path="res://Entities/ShungiteSpike.cs" id="1_pclpe"] -[ext_resource type="Texture2D" uid="uid://dmeqjcc3uu4xi" path="res://Assets/Sprites/Misc/shungite.png" id="2_gyvna"] -[ext_resource type="PackedScene" uid="uid://du5vhccg75nrq" path="res://BoundingBoxes/Hitbox.tscn" id="3_kojrj"] -[ext_resource type="Script" path="res://Utils/ProjectileTweeners/DelaySpin.cs" id="4_wy5kh"] +[ext_resource type="Script" path="res://Entities/ShungiteDart.cs" id="1_jbgb8"] +[ext_resource type="Texture2D" uid="uid://dmeqjcc3uu4xi" path="res://Assets/Sprites/Misc/shungite.png" id="2_eh4e1"] +[ext_resource type="PackedScene" uid="uid://du5vhccg75nrq" path="res://BoundingBoxes/Hitbox.tscn" id="3_gdyk8"] [sub_resource type="AtlasTexture" id="AtlasTexture_xmjp8"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(0, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_8i61s"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(8, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_q000r"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(16, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_0f7fg"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(24, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_d34ii"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(32, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_iybvf"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(40, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_rninu"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(48, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_8vok2"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(56, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_7tcc7"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(64, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_sfa0w"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(72, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_21chc"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(80, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_iroma"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(88, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_hbl5e"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(96, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_qlpso"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(104, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_v65pa"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(112, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_jotwh"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(120, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_lu113"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(128, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_w332l"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(136, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_mg73k"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(144, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_m0ogr"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(152, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_py1jk"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(160, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_0a8wd"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(168, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_8ut6e"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(176, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_x5ucf"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(184, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_13nfm"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(192, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_uhjdb"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(200, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_4vrn8"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(208, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_4aa2t"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(216, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_tn6f5"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(224, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_60mwy"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(232, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_d0xqb"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(240, 0, 8, 8) [sub_resource type="AtlasTexture" id="AtlasTexture_j2hu2"] -atlas = ExtResource("2_gyvna") +atlas = ExtResource("2_eh4e1") region = Rect2(248, 0, 8, 8) [sub_resource type="SpriteFrames" id="SpriteFrames_6a2jq"] @@ -240,21 +239,6 @@ animations = [{ [sub_resource type="RectangleShape2D" id="RectangleShape2D_fa7yf"] size = Vector2(8, 4) -[sub_resource type="Animation" id="Animation_tgj7f"] -resource_name = "spin" -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:rotation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.5), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [-4.71239, 1.5708] -} - [sub_resource type="Animation" id="Animation_tcdo0"] length = 0.001 tracks/0/type = "value" @@ -270,14 +254,29 @@ tracks/0/keys = { "values": [1.5708] } +[sub_resource type="Animation" id="Animation_tgj7f"] +resource_name = "spin" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:rotation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.5), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [-4.71239, 1.5708] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_pehte"] _data = { "RESET": SubResource("Animation_tcdo0"), "spin": SubResource("Animation_tgj7f") } -[node name="ShungiteSpike" type="RigidBody2D" node_paths=PackedStringArray("Hitbox")] -script = ExtResource("1_pclpe") +[node name="ShungiteDart" type="RigidBody2D" node_paths=PackedStringArray("Hitbox")] +script = ExtResource("1_jbgb8") Speed = 256.0 Hitbox = NodePath("Hitbox") Delay = 1.0 @@ -289,16 +288,13 @@ sprite_frames = SubResource("SpriteFrames_6a2jq") frame_progress = 0.227702 speed_scale = 4.0 -[node name="Hitbox" parent="." instance=ExtResource("3_kojrj")] +[node name="Hitbox" parent="." instance=ExtResource("3_gdyk8")] Damage = 25.0 Knockback = 128.0 [node name="CollisionShape2D" parent="Hitbox" index="0"] shape = SubResource("RectangleShape2D_fa7yf") -[node name="DelaySpinTweener" type="Node" parent="."] -script = ExtResource("4_wy5kh") - [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { "": SubResource("AnimationLibrary_pehte") diff --git a/Scenes/Maps/Arena.tscn b/Scenes/Maps/Arena.tscn index 56cbf2d..c5db8f1 100644 --- a/Scenes/Maps/Arena.tscn +++ b/Scenes/Maps/Arena.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://clwv2owvk6abe" path="res://Scenes/BaseMap.tscn" id="1_ifiic"] [ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="2_wnjm0"] [ext_resource type="Texture2D" uid="uid://5k0o7d7j65a4" path="res://Assets/Sprites/arena-tileset-normal.png" id="3_iitgk"] -[ext_resource type="PackedScene" uid="uid://bt6s40u515jvo" path="res://Characters/Doc.tscn" id="4_c0csw"] +[ext_resource type="PackedScene" uid="uid://dsr5kkbthpwpl" path="res://Characters/Doc.tscn" id="4_c0csw"] [ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="5_aevwf"] [sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_8jil2"] @@ -252,7 +252,7 @@ physics_layer_0/collision_layer = 1 sources/2 = SubResource("TileSetAtlasSource_5yxvt") sources/0 = SubResource("TileSetAtlasSource_fcd6d") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_hn0x7"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_4g4ap"] resource_local_to_scene = true shader = ExtResource("5_aevwf") shader_parameter/color = Quaternion(1, 1, 1, 1) @@ -268,6 +268,6 @@ layer_4/tile_data = PackedInt32Array(-524296, 327680, 0, -589818, 262144, 0, -58 color = Color(0.753984, 0.753984, 0.753984, 1) [node name="Doc" parent="Entities" index="0" instance=ExtResource("4_c0csw")] -material = SubResource("ShaderMaterial_hn0x7") +material = SubResource("ShaderMaterial_4g4ap") PreferredWeightDistance = 256.0 MaxWeightDistance = 32.0