sandvich
/
SupaLidlGame
mirror of https://github.com/humanoidsandvichdispenser/SupaLidlgame
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adjust variables

issue-templates
John Montagu, the 4th Earl of Sandvich 2024-03-26 12:46:37 -07:00
parent cc0f0c0dd8
commit 57c821b55c
Signed by: sandvich
GPG Key ID: 9A39BE37E602B22D
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Characters/Character.cs
View File

@ -171,7 +171,8 @@ public partial class Character : CharacterBody2D, IFaction
{ {
if (StunTime > 0) if (StunTime > 0)
{ {
Velocity *= 0.25f; //Velocity *= 0.25f;
Velocity = Vector2.Zero;
} }
var state = StateMachine.CurrentState; var state = StateMachine.CurrentState;

1
Characters/Player.cs
View File

@ -119,6 +119,7 @@ public sealed partial class Player : Character
public void Spawn() public void Spawn()
{ {
Health = 100; Health = 100;
Velocity = Vector2.Zero; // player retains knockback after respawning
HurtAnimation.Play("spawn"); HurtAnimation.Play("spawn");
} }

3
Characters/Player.tscn
View File

@ -831,9 +831,6 @@ InventoryMap = {
visible = false visible = false
StateMachine = NodePath("StateMachine") 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")] [node name="Sword" parent="Inventory" node_paths=PackedStringArray("Hitbox", "AnimationPlayer", "ParryParticles", "StateMachine", "Anchor", "HandAnchor") instance=ExtResource("31_ql4as")]
visible = false visible = false
Hitbox = NodePath("Hitbox") Hitbox = NodePath("Hitbox")

12
UI/PostProcessing/Vignette.tscn
View File

@ -6,8 +6,8 @@
[sub_resource type="ShaderMaterial" id="ShaderMaterial_fmdjb"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_fmdjb"]
shader = ExtResource("1_nrekm") shader = ExtResource("1_nrekm")
shader_parameter/vignette_intensity = 0.1 shader_parameter/vignette_intensity = 0.2
shader_parameter/vignette_opacity = 0.2 shader_parameter/vignette_opacity = 0.3
shader_parameter/vignette_rgb = Color(0, 0, 0, 1) shader_parameter/vignette_rgb = Color(0, 0, 0, 1)
[sub_resource type="Animation" id="Animation_ph4f2"] [sub_resource type="Animation" id="Animation_ph4f2"]
@ -22,7 +22,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0), "times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1), "transitions": PackedFloat32Array(1),
"update": 0, "update": 0,
"values": [0.1] "values": [0.2]
} }
tracks/1/type = "value" tracks/1/type = "value"
tracks/1/imported = false tracks/1/imported = false
@ -34,7 +34,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0), "times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1), "transitions": PackedFloat32Array(1),
"update": 0, "update": 0,
"values": [0.2] "values": [0.3]
} }
[sub_resource type="Animation" id="Animation_sqaf2"] [sub_resource type="Animation" id="Animation_sqaf2"]
@ -50,7 +50,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0, 0.2, 0.5), "times": PackedFloat32Array(0, 0.2, 0.5),
"transitions": PackedFloat32Array(1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1),
"update": 0, "update": 0,
"values": [0.4, 0.1, 0.1] "values": [0.8, 0.2, 0.2]
} }
tracks/1/type = "value" tracks/1/type = "value"
tracks/1/imported = false tracks/1/imported = false
@ -62,7 +62,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0.2, 0.5), "times": PackedFloat32Array(0.2, 0.5),
"transitions": PackedFloat32Array(1, 0.25), "transitions": PackedFloat32Array(1, 0.25),
"update": 0, "update": 0,
"values": [1.0, 0.2] "values": [1.0, 0.3]
} }
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s4mrn"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_s4mrn"]