654328847

Build Type

github

Committed by GitHub

Commit Message

Merge 7f1210593 into 54b1be009

Pull Request Pull Request #1056: Fix 967 transition break game

Run Details

2124 of 3426 branches covered (62.0%)

Branch coverage included in aggregate %.

5 of 6 new or added lines in 1 file covered. (83.33%)

32 existing lines in 13 files now uncovered.

5836 of 7657 relevant lines covered (76.22%)

37910.29 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

82.05

/Zilon.Core/Zilon.Core/Tactics/Behaviour/MoveTask.cs

﻿using System;
using System.Collections.Generic;
using System.Linq;

using Zilon.Core.Graphs;
using Zilon.Core.Persons;
using Zilon.Core.Tactics.Spatial;
using Zilon.Core.World;

namespace Zilon.Core.Tactics.Behaviour
{
    public class MoveTask : ActorTaskBase
    {
        private readonly ISectorMap _map;
        private readonly List<IGraphNode> _path;

        public MoveTask(IActor actor, IActorTaskContext context, IGraphNode targetNode, ISectorMap map) : this(actor,
            context, targetNode, map, GlobeMetrics.OneIterationLength)
        {
        }

        public MoveTask(IActor actor, IActorTaskContext context, IGraphNode targetNode, ISectorMap map, int cost) :
            base(actor, context)
        {
            TargetNode = targetNode ?? throw new ArgumentNullException(nameof(targetNode));
            _map = map ?? throw new ArgumentNullException(nameof(map));
            Cost = cost;
            if (actor.Node == targetNode)
            {
                // Это может произойти, если источник команд выбрал целевую точку ту же, что и сам актёр
                // в результате рандома.
                IsComplete = true;

                _path = new List<IGraphNode>(0);
            }
            else
            {
                _path = new List<IGraphNode>();

                CreatePath();

                if (!_path.Any())
                {
                    IsComplete = true;
                }
            }
        }

        public override int Cost { get; }

        public IGraphNode TargetNode { get; }

        public bool CanExecute()
        {
            if (!_path.Any())
            {
                return false;
            }

            var nextNode = _path[0];

            return _map.IsPositionAvailableFor(nextNode, Actor);
        }

        public override void Execute()
        {
            if (IsComplete)
            {
                return;
            }

            if (!_path.Any())
            {
                if (TargetNode != Actor.Node)
                {
                    throw new TaskException("Актёр не достиг целевого узла при окончании пути.");
                }

                IsComplete = true;
                return;
            }

            var nextNode = _path[0];

            var actorCanMove = !Actor.Person.CheckIsDead();

            if (actorCanMove && _map.IsPositionAvailableFor(nextNode, Actor))
            {
                ReleaseNodes(Actor);
                Actor.MoveToNode(nextNode);
                HoldNodes(nextNode, Actor);

                _path.RemoveAt(0);

                if (!_path.Any())
                {
                    IsComplete = true;
                }
            }
            else
            {
                // Это может произойти, если кто-то опередил текущего персонажа и занял узел первым.
                IsComplete = true;
            }
        }

        public override string ToString()
        {
            return $"{Actor} ({TargetNode})";
        }

        private void CreatePath()
        {
            var context = new ActorPathFindingContext(Actor, _map, TargetNode);

            var startNode = Actor.Node;
            var finishNode = TargetNode;

            _path.Clear();

            _map.FindPath(startNode, finishNode, context, _path);
        }

        private IEnumerable<IGraphNode> GetActorNodes(IPerson person, IGraphNode baseNode)
        {
            yield return baseNode;

            if (person.PhysicalSize == PhysicalSizePattern.Size7)
            {
                var neighbors = _map.GetNext(baseNode);
                foreach (var neighbor in neighbors)
                {
                    yield return neighbor;
                }
            }
        }

        private void HoldNodes(IGraphNode nextNode, IActor actor)
        {
            var actorNodes = GetActorNodes(actor.Person, nextNode);

            foreach (var node in actorNodes)
            {
                _map.HoldNode(node, actor);
            }
        }

        private void ReleaseNodes(IActor actor)
        {
            var actorNodes = GetActorNodes(actor.Person, actor.Node);

            foreach (var node in actorNodes)
            {
                _map.ReleaseNode(node, actor);
            }
        }
    }
}

1	using System;
2	using System.Collections.Generic;
3	using System.Linq;
4
5	using Zilon.Core.Graphs;
6	using Zilon.Core.Persons;
7	using Zilon.Core.Tactics.Spatial;
8	using Zilon.Core.World;
9
10	namespace Zilon.Core.Tactics.Behaviour
11	{
12	public class MoveTask : ActorTaskBase
13	{
14	private readonly ISectorMap _map;
15	private readonly List<IGraphNode> _path;
16
17	public MoveTask(IActor actor, IActorTaskContext context, IGraphNode targetNode, ISectorMap map) : this(actor,	465✔
18	context, targetNode, map, GlobeMetrics.OneIterationLength)	465✔
19	{
20	}	465✔
21
22	public MoveTask(IActor actor, IActorTaskContext context, IGraphNode targetNode, ISectorMap map, int cost) :
23	base(actor, context)	465✔
24	{
25	TargetNode = targetNode ?? throw new ArgumentNullException(nameof(targetNode));	465!
26	_map = map ?? throw new ArgumentNullException(nameof(map));	465!
27	Cost = cost;	465✔
28	if (actor.Node == targetNode)	465✔
29	{
30	// Это может произойти, если источник команд выбрал целевую точку ту же, что и сам актёр
31	// в результате рандома.
32	IsComplete = true;	13✔
33
34	_path = new List<IGraphNode>(0);	13✔
35	}
36	else
37	{
38	_path = new List<IGraphNode>();	452✔
39
40	CreatePath();	452✔
41
42	if (!_path.Any())	452!
43	{
UNCOV 44	IsComplete = true;	×
45	}
46	}
47	}	452✔
48
49	public override int Cost { get; }
50
51	public IGraphNode TargetNode { get; }
52
53	public bool CanExecute()
54	{
55	if (!_path.Any())	1,281!
56	{
UNCOV 57	return false;	×
58	}
59
60	var nextNode = _path[0];	1,281✔
61
62	return _map.IsPositionAvailableFor(nextNode, Actor);	1,281✔
63	}
64
65	public override void Execute()
66	{
67	if (IsComplete)	1,721✔
68	{
69	return;	11✔
70	}
71
72	if (!_path.Any())	1,710!
73	{
74	if (TargetNode != Actor.Node)	×
75	{
76	throw new TaskException("Актёр не достиг целевого узла при окончании пути.");	×
77	}
78
79	IsComplete = true;	×
80	return;	×
81	}
82
83	var nextNode = _path[0];	1,710✔
84
85	var actorCanMove = !Actor.Person.CheckIsDead();	1,710✔
86
87	if (actorCanMove && _map.IsPositionAvailableFor(nextNode, Actor))	1,710✔
88	{
89	ReleaseNodes(Actor);	1,699✔
90	Actor.MoveToNode(nextNode);	1,699✔
91	HoldNodes(nextNode, Actor);	1,699✔
92
93	_path.RemoveAt(0);	1,699✔
94
95	if (!_path.Any())	1,699✔
96	{
97	IsComplete = true;	328✔
98	}
99	}
100	else
101	{
102	// Это может произойти, если кто-то опередил текущего персонажа и занял узел первым.
103	IsComplete = true;	11✔
104	}
105	}	1,382✔
106
107	public override string ToString()
108	{
109	return $"{Actor} ({TargetNode})";	×
110	}
111
112	private void CreatePath()
113	{
114	var context = new ActorPathFindingContext(Actor, _map, TargetNode);	452✔
115
116	var startNode = Actor.Node;	452✔
117	var finishNode = TargetNode;	452✔
118
119	_path.Clear();	452✔
120
121	_map.FindPath(startNode, finishNode, context, _path);	452✔
122	}	452✔
123
124	private IEnumerable<IGraphNode> GetActorNodes(IPerson person, IGraphNode baseNode)
125	{
126	yield return baseNode;
127
128	if (person.PhysicalSize == PhysicalSizePattern.Size7)
129	{
130	var neighbors = _map.GetNext(baseNode);
131	foreach (var neighbor in neighbors)
132	{
133	yield return neighbor;
134	}
135	}
136	}
137
138	private void HoldNodes(IGraphNode nextNode, IActor actor)
139	{
140	var actorNodes = GetActorNodes(actor.Person, nextNode);	1,699✔
141
142	foreach (var node in actorNodes)	6,796✔
143	{
144	_map.HoldNode(node, actor);	1,699✔
145	}
146	}	1,699✔
147
148	private void ReleaseNodes(IActor actor)
149	{
150	var actorNodes = GetActorNodes(actor.Person, actor.Node);	1,699✔
151
152	foreach (var node in actorNodes)	6,796✔
153	{
154	_map.ReleaseNode(node, actor);	1,699✔
155	}
156	}	1,699✔
157	}
158	}

kreghek / Zilon_Roguelike / 654328847

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous