Compare commits
	
		
			No commits in common. "57c821b55c5d16d20610182ca72645fd5131d0d9" and "87b189f7793cc8edd22e9e89574618685573bc13" have entirely different histories. 
		
	
	
		
			57c821b55c
			...
			87b189f779
		
	
		
	| 
						 | 
					@ -171,8 +171,7 @@ 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;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -50,12 +50,16 @@ public sealed partial class Player : Character
 | 
				
			||||||
    public override void _Ready()
 | 
					    public override void _Ready()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        InteractionRay = GetNode<InteractionRay>("Direction2D/InteractionRay");
 | 
					        InteractionRay = GetNode<InteractionRay>("Direction2D/InteractionRay");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        _effects = GetNode<Node2D>("%Effects");
 | 
					        _effects = GetNode<Node2D>("%Effects");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        _characterEffects = GetNode<Node2D>("%CharacterEffects");
 | 
					        _characterEffects = GetNode<Node2D>("%CharacterEffects");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        _targetTracer = GetNode<TargetTracer>("%TargetTracer");
 | 
					        _targetTracer = GetNode<TargetTracer>("%TargetTracer");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        base._Ready();
 | 
					        base._Ready();
 | 
				
			||||||
        Stats = GetNode<PlayerStats>("Stats");
 | 
					
 | 
				
			||||||
 | 
					        Stats = base.Stats as PlayerStats;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Inventory.UsedItem += (Items.Item item) =>
 | 
					        Inventory.UsedItem += (Items.Item item) =>
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
| 
						 | 
					@ -71,6 +75,8 @@ public sealed partial class Player : Character
 | 
				
			||||||
            this.GetEventBus().EmitSignal(signal, args);
 | 
					            this.GetEventBus().EmitSignal(signal, args);
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //GD.Print("Inventory: " + Inventory.Items);
 | 
				
			||||||
 | 
					        //Inventory.AddItemToHotbar(Inventory.Items[0]);
 | 
				
			||||||
        Inventory.SelectedIndex = 0;
 | 
					        Inventory.SelectedIndex = 0;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -119,7 +125,6 @@ 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");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -831,6 +831,9 @@ 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")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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.2
 | 
					shader_parameter/vignette_intensity = 0.1
 | 
				
			||||||
shader_parameter/vignette_opacity = 0.3
 | 
					shader_parameter/vignette_opacity = 0.2
 | 
				
			||||||
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.2]
 | 
					"values": [0.1]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
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.3]
 | 
					"values": [0.2]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[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.8, 0.2, 0.2]
 | 
					"values": [0.4, 0.1, 0.1]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
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.3]
 | 
					"values": [1.0, 0.2]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s4mrn"]
 | 
					[sub_resource type="AnimationLibrary" id="AnimationLibrary_s4mrn"]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue