Compare commits

...

2 Commits

4 changed files with 10 additions and 17 deletions

View File

@ -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;

View File

@ -50,16 +50,12 @@ public sealed partial class Player : Character
public override void _Ready()
{
InteractionRay = GetNode<InteractionRay>("Direction2D/InteractionRay");
_effects = GetNode<Node2D>("%Effects");
_characterEffects = GetNode<Node2D>("%CharacterEffects");
_targetTracer = GetNode<TargetTracer>("%TargetTracer");
base._Ready();
Stats = base.Stats as PlayerStats;
Stats = GetNode<PlayerStats>("Stats");
Inventory.UsedItem += (Items.Item item) =>
{
@ -75,8 +71,6 @@ public sealed partial class Player : Character
this.GetEventBus().EmitSignal(signal, args);
};
//GD.Print("Inventory: " + Inventory.Items);
//Inventory.AddItemToHotbar(Inventory.Items[0]);
Inventory.SelectedIndex = 0;
}
@ -125,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");
}

View File

@ -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")

View File

@ -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"]