admin/peggle-roguelike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

think i finally solved movement going into enemy territory

Browse Source
This commit is contained in:
cojoedmo
2026-07-05 02:51:09 -04:00
parent dbafefd660
commit bfcd48e657
9 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pegs/Actions/BasicMovement.cs
+3 -1
View File
@@ -48,7 +48,9 @@ public partial class BasicMovement : PegAction
public override bool MeetsCriteria(Peg PEG)
{
List<MapCell> bestPath = PEG.GetBestPath(true);
return base.MeetsCriteria(PEG) && bestPath.Count > 0;
return base.MeetsCriteria(PEG)
&& bestPath.Count > 0
&& PEG._map.GetCellDisposition(bestPath[0]._address) != -(int)PEG._disposition;
}
Pegs/Actions/ShootShortbow.cs
+1 -6
View File
@@ -25,16 +25,11 @@ public partial class ShootShortbow : PegAction
subtween.TweenProperty(_image, "global_position", target.GlobalPosition, 0.5f);
subtween.TweenCallback(Callable.From(() =>
{
((Peg)target._occupant)._pegController._playerController.ChangeHealth(-2, this);
PEG._pegController._playerController.ChangeHealth(-2, this);
Position = Vector2.Zero;
Visible = false;
}));
return subtween;
}
public override MapCell Target(Peg PEG)
{
return PEG.Goal();
}
}
Pegs/Actions/SwingShortsword.cs
+1 -7
View File
@@ -26,16 +26,10 @@ public partial class SwingShortsword : PegAction
subtween.TweenProperty(_image, "global_position", target.GlobalPosition, 0.5f);
subtween.TweenCallback(Callable.From(() =>
{
((Peg)target._occupant)._pegController._playerController.ChangeHealth(-2, this);
PEG._pegController._playerController.ChangeHealth(-2, this);
_image.Position = Vector2.Zero;
_image.Visible = false;
}));
return subtween;
}
public override MapCell Target(Peg PEG)
{
return PEG.Goal();
}
}
Pegs/Actions/ThrustSpear.cs
+1 -1
View File
@@ -28,7 +28,7 @@ public partial class ThrustSpear : PegAction
subtween.TweenProperty(_image, "global_position", target.GlobalPosition, 0.5f);
subtween.TweenCallback(Callable.From(() =>
{
((Peg)target._occupant).ChangeHealth(-1);
((Peg)target?._occupant)?.ChangeHealth(-1);
_image.Position = Vector2.Zero;
_image.Visible = false;
}));