Drown animation

This commit is contained in:
Marco 2025-03-11 17:58:46 +01:00
commit aa2de85f9a
16 changed files with 264 additions and 14 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=57 format=3 uid="uid://c4pr2707hbeph"]
[gd_scene load_steps=58 format=3 uid="uid://c4pr2707hbeph"]
[ext_resource type="Script" uid="uid://d2ubk5gucny6s" path="res://Scripts/Components/FSM/PlayerFSMProxy.cs" id="1_g3wua"]
[ext_resource type="Script" uid="uid://bw2hakslndaxm" path="res://Scripts/Components/FSM/PlayerStateMachine.cs" id="1_mpmil"]
@ -18,6 +18,7 @@
[ext_resource type="PackedScene" uid="uid://biugfbp0yae2s" path="res://Scenes/Particles/DeathParticles.tscn" id="9_0pyos"]
[ext_resource type="Script" uid="uid://d208gvthkstvc" path="res://Scripts/Components/Actors/PlayerCrosshairProvider.cs" id="9_s0ir4"]
[ext_resource type="Texture2D" uid="uid://cfrvb1moh857m" path="res://Sprites/Crosshair.png" id="10_8dcio"]
[ext_resource type="Script" uid="uid://bgve2lktony00" path="res://Scripts/Components/FSM/Player/Drowning.cs" id="10_es1gk"]
[ext_resource type="Script" uid="uid://3jxrxcqp3ndr" path="res://Scripts/Components/Actors/PlayerHitboxSpriteProvider.cs" id="10_gp3hw"]
[ext_resource type="Texture2D" uid="uid://bwjrdlnysft15" path="res://Sprites/Actors/Focus_Circle.png" id="12_8dcio"]
[ext_resource type="Texture2D" uid="uid://bf37ce6jskdel" path="res://Sprites/SmallHitbox.png" id="13_pmkfo"]
@ -274,14 +275,20 @@ _animationProvider = NodePath("../../AnimationProvider")
_inputProvider = NodePath("../../InputProvider")
_healthProvider = NodePath("../../DamageReceiver/HealthProvider")
[node name="Drowning" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("_animationProvider")]
script = ExtResource("10_es1gk")
_animationProvider = NodePath("../../AnimationProvider")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_b3hxm")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
material = ExtResource("4_5qlss")
sprite_frames = ExtResource("4_s0ir4")
animation = &"walk_down"
frame_progress = 0.50115
animation = &"Drowning"
autoplay = "idle"
frame = 15
frame_progress = 0.860925
[node name="WeaponProvider" type="Node2D" parent="."]
script = ExtResource("5_gp3hw")

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=54 format=4 uid="uid://dqyfnby0t7gu1"]
[gd_scene load_steps=56 format=4 uid="uid://dqyfnby0t7gu1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_c3v4x"]
[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_6314l"]
@ -10,6 +10,7 @@
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="8_c3v4x"]
[ext_resource type="Material" uid="uid://cdaeormgf78de" path="res://Resources/Materials/Static_Scanlines.tres" id="8_cub4j"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="9_dj0ui"]
[ext_resource type="Script" uid="uid://crpkvxepkcrir" path="res://Scripts/Components/Actors/ForceFieldCollisionDisabler.cs" id="9_wt88c"]
[ext_resource type="PackedScene" uid="uid://cmr6fclttrpkb" path="res://Scenes/Items/Ammo1.tscn" id="10_6314l"]
[ext_resource type="PackedScene" uid="uid://d0j1bmgbefyp2" path="res://Scenes/Actors/Lightbridge.tscn" id="10_k6t8d"]
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="10_qmakk"]
@ -57,6 +58,9 @@ size = Vector2(30, 52.5)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_cub4j"]
size = Vector2(30, 50.25)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_31m6w"]
size = Vector2(30, 53.5)
[sub_resource type="Gradient" id="Gradient_2vu2h"]
colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 1)
@ -130,6 +134,13 @@ shape = SubResource("RectangleShape2D_rff8l")
position = Vector2(413, 106.875)
shape = SubResource("RectangleShape2D_cub4j")
[node name="CollisionShape2D3" type="CollisionShape2D" parent="Tilemaps/AcidHitboxes/Acid" node_paths=PackedStringArray("_door")]
position = Vector2(385, 107.75)
shape = SubResource("RectangleShape2D_31m6w")
script = ExtResource("9_wt88c")
_door = NodePath("../../LightBridge2")
Invert = true
[node name="LightBridge" type="Node2D" parent="Tilemaps/AcidHitboxes"]
position = Vector2(501.697, 121.54)
metadata/_edit_group_ = true

View file

@ -195,7 +195,7 @@ ActivationType = 0
Targets = Array[NodePath]([NodePath("../Rumia")])
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_bwt6v"]
[sub_resource type="Resource" id="Resource_gd7x4"]
resource_local_to_scene = true
script = ExtResource("49_0si7g")
Target = NodePath(".")
@ -798,7 +798,7 @@ Events = Array[ExtResource("42_gd7x4")]([SubResource("Resource_068l7"), SubResou
[node name="BossBattleStartScript" parent="Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")]
position = Vector2(-1487, -396)
Events = Array[ExtResource("42_gd7x4")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_bwt6v")])
Events = Array[ExtResource("42_gd7x4")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_gd7x4")])
[node name="Enemy13" parent="Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")]
position = Vector2(-1657, -788)