diff --git a/Characters/Character.cs b/Characters/Character.cs index 67f5769..357ee7b 100644 --- a/Characters/Character.cs +++ b/Characters/Character.cs @@ -171,7 +171,8 @@ public partial class Character : CharacterBody2D, IFaction { if (StunTime > 0) { - Velocity *= 0.25f; + //Velocity *= 0.25f; + Velocity = Vector2.Zero; } var state = StateMachine.CurrentState; diff --git a/Characters/Player.cs b/Characters/Player.cs index 8c987aa..91a2150 100644 --- a/Characters/Player.cs +++ b/Characters/Player.cs @@ -119,6 +119,7 @@ public sealed partial class Player : Character public void Spawn() { Health = 100; + Velocity = Vector2.Zero; // player retains knockback after respawning HurtAnimation.Play("spawn"); } diff --git a/Characters/Player.tscn b/Characters/Player.tscn index d538cc1..1767787 100644 --- a/Characters/Player.tscn +++ b/Characters/Player.tscn @@ -831,9 +831,6 @@ InventoryMap = { visible = false StateMachine = NodePath("StateMachine") -[node name="RemoteTransform2D2" type="RemoteTransform2D" parent="Inventory"] -position = Vector2(0, 4) - [node name="Sword" parent="Inventory" node_paths=PackedStringArray("Hitbox", "AnimationPlayer", "ParryParticles", "StateMachine", "Anchor", "HandAnchor") instance=ExtResource("31_ql4as")] visible = false Hitbox = NodePath("Hitbox") diff --git a/UI/PostProcessing/Vignette.tscn b/UI/PostProcessing/Vignette.tscn index 11345cd..c362dd1 100644 --- a/UI/PostProcessing/Vignette.tscn +++ b/UI/PostProcessing/Vignette.tscn @@ -6,8 +6,8 @@ [sub_resource type="ShaderMaterial" id="ShaderMaterial_fmdjb"] shader = ExtResource("1_nrekm") -shader_parameter/vignette_intensity = 0.1 -shader_parameter/vignette_opacity = 0.2 +shader_parameter/vignette_intensity = 0.2 +shader_parameter/vignette_opacity = 0.3 shader_parameter/vignette_rgb = Color(0, 0, 0, 1) [sub_resource type="Animation" id="Animation_ph4f2"] @@ -22,7 +22,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [0.1] +"values": [0.2] } tracks/1/type = "value" tracks/1/imported = false @@ -34,7 +34,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [0.2] +"values": [0.3] } [sub_resource type="Animation" id="Animation_sqaf2"] @@ -50,7 +50,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0, 0.2, 0.5), "transitions": PackedFloat32Array(1, 1, 1), "update": 0, -"values": [0.4, 0.1, 0.1] +"values": [0.8, 0.2, 0.2] } tracks/1/type = "value" tracks/1/imported = false @@ -62,7 +62,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0.2, 0.5), "transitions": PackedFloat32Array(1, 0.25), "update": 0, -"values": [1.0, 0.2] +"values": [1.0, 0.3] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_s4mrn"]