fix other stuff from map switching
parent
df6b75613c
commit
fe11421fc1
|
@ -16,6 +16,8 @@ namespace SupaLidlGame.BoundingBoxes
|
|||
[Export]
|
||||
public float Damage { get; set; }
|
||||
|
||||
private bool _isDisabled = false;
|
||||
|
||||
/// <summary>
|
||||
/// Getter/setter for the CollisionShape2D's Disabled property.
|
||||
/// </summary>
|
||||
|
@ -25,10 +27,14 @@ namespace SupaLidlGame.BoundingBoxes
|
|||
get => _collisionShape.Disabled;
|
||||
set
|
||||
{
|
||||
_collisionShape.Disabled = value;
|
||||
if (value)
|
||||
_isDisabled = value;
|
||||
if (_collisionShape is not null)
|
||||
{
|
||||
DamageStartTime = Time.GetTicksMsec();
|
||||
_collisionShape.Disabled = value;
|
||||
if (value)
|
||||
{
|
||||
DamageStartTime = Time.GetTicksMsec();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -47,6 +53,7 @@ namespace SupaLidlGame.BoundingBoxes
|
|||
public override void _Ready()
|
||||
{
|
||||
_collisionShape = GetNode<CollisionShape2D>("CollisionShape2D");
|
||||
IsDisabled = _isDisabled; // sets _collisionShape.Disabled
|
||||
}
|
||||
|
||||
private bool ShouldParry(Hitbox box)
|
||||
|
|
|
@ -141,7 +141,6 @@ StateMachine = NodePath("StateMachine")
|
|||
Faction = 1
|
||||
|
||||
[node name="Camera2D" parent="." instance=ExtResource("4_ym125")]
|
||||
position_smoothing_enabled = true
|
||||
position_smoothing_speed = 8.0
|
||||
|
||||
[node name="Sprite" type="AnimatedSprite2D" parent="."]
|
||||
|
@ -174,6 +173,7 @@ script = ExtResource("6_6bgrj")
|
|||
IdleState = NodePath("../Idle")
|
||||
|
||||
[node name="Debug" type="Control" parent="."]
|
||||
visible = false
|
||||
layout_mode = 3
|
||||
anchors_preset = 0
|
||||
|
||||
|
|
Loading…
Reference in New Issue