815989533

Build Type

github

Committed by GitHub

Commit Message

Merge d79edccc6 into 68c3dbcc7

Pull Request Pull Request #1086: Fix 966 command autoexecute

Run Details

2290 of 3696 branches covered (61.96%)

Branch coverage included in aggregate %.

9 of 16 new or added lines in 5 files covered. (56.25%)

49 existing lines in 18 files now uncovered.

6123 of 8054 relevant lines covered (76.02%)

48249.98 hits per line

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

74.29

/Zilon.Core/Zilon.Core/MapGenerators/SectorGenerator.cs

﻿using System;
using System.Linq;
using System.Threading.Tasks;

using Zilon.Core.Schemes;
using Zilon.Core.Tactics;
using Zilon.Core.World;

namespace Zilon.Core.MapGenerators
{
    /// <summary>
    /// Реализация генератора сектора для подземелий.
    /// </summary>
    /// <seealso cref="ISectorGenerator" />
    public class SectorGenerator : ISectorGenerator
    {
        private readonly IDiseaseGenerator _diseaseGenerator;
        private readonly IMapFactorySelector _mapFactorySelector;
        private readonly IMonsterGenerator _monsterGenerator;
        private readonly IResourceMaterializationMap _resourceMaterializationMap;
        private readonly ISectorFactory _sectorFactory;
        private readonly IStaticObstaclesGenerator _staticObstaclesGenerator;

        /// <summary>
        /// Создаёт экземпляр <see cref="SectorGenerator" />.
        /// </summary>
        /// <param name="mapFactorySelector"> Сервис для выбора фабрики для создания карты. </param>
        /// <param name="sectorFactory"> Фабрика сектора. </param>
        /// <param name="monsterGenerator"> Генератор монстров для подземелий. </param>
        public SectorGenerator(
            IMapFactorySelector mapFactorySelector,
            ISectorFactory sectorFactory,
            IMonsterGenerator monsterGenerator,
            IStaticObstaclesGenerator staticObstaclesGenerator,
            IDiseaseGenerator diseaseGenerator,
            IResourceMaterializationMap resourceMaterializationMap)
        {
            _mapFactorySelector = mapFactorySelector ?? throw new ArgumentNullException(nameof(mapFactorySelector));
            _sectorFactory = sectorFactory ?? throw new ArgumentNullException(nameof(sectorFactory));
            _monsterGenerator = monsterGenerator ?? throw new ArgumentNullException(nameof(monsterGenerator));
            _staticObstaclesGenerator = staticObstaclesGenerator ??
                                        throw new ArgumentNullException(nameof(staticObstaclesGenerator));
            _diseaseGenerator = diseaseGenerator ?? throw new ArgumentNullException(nameof(diseaseGenerator));
            _resourceMaterializationMap = resourceMaterializationMap ??
                                          throw new ArgumentNullException(nameof(resourceMaterializationMap));
        }

        private void DefineDiseases(ISector sector)
        {
            var disease = _diseaseGenerator.Create();

            if (disease is null)
            {
                return;
            }

            sector.AddDisease(disease);
        }

        private async Task GenerateStaticObjectsAsync(
            ISector sector,
            ISectorSubScheme sectorScheme,
            ISectorNode sectorNode)
        {
            var resourceDepositData = _resourceMaterializationMap.GetDepositData(sectorNode);
            var context = new StaticObjectGenerationContext(sector, sectorScheme, resourceDepositData);

            await _staticObstaclesGenerator.CreateAsync(context).ConfigureAwait(false);
        }

        /// <summary>
        /// Создаёт экземпляр сектора подземелий с указанными параметрами.
        /// </summary>
        /// <param name="sectorNode"> Схема генерации сектора. </param>
        /// <returns> Возвращает экземпляр сектора. </returns>
        public async Task<ISector> GenerateAsync(ISectorNode sectorNode)
        {
            if (sectorNode is null)
            {
                throw new ArgumentNullException(nameof(sectorNode));
            }

            var mapFactory = _mapFactorySelector.GetMapFactory(sectorNode);

            var transitions = MapFactoryHelper.CreateTransitions(sectorNode);

            var mapGeneratorOptions = sectorNode.SectorScheme.MapGeneratorOptions;
            if (mapGeneratorOptions is null)
            {
                throw new InvalidOperationException();
            }

            var sectorFactoryOptions = new SectorMapFactoryOptions(mapGeneratorOptions, transitions);

            var map = await mapFactory.CreateAsync(sectorFactoryOptions).ConfigureAwait(false);

            var locationScheme = sectorNode.Biome.LocationScheme;

            var sector = _sectorFactory.Create(map, locationScheme);

            DefineDiseases(sector);

            var gameObjectRegions = map.Regions.Where(x => !x.IsStart).ToArray();

            var sectorScheme = sectorNode.SectorScheme;

            await GenerateStaticObjectsAsync(sector, sectorScheme, sectorNode).ConfigureAwait(false);

            var monsterRegions = gameObjectRegions.ToArray();
            _monsterGenerator.CreateMonsters(sector,
                monsterRegions,
                sectorScheme);

            return sector;
        }
    }
}

1	using System;
2	using System.Linq;
3	using System.Threading.Tasks;
4
5	using Zilon.Core.Schemes;
6	using Zilon.Core.Tactics;
7	using Zilon.Core.World;
8
9	namespace Zilon.Core.MapGenerators
10	{
11	/// <summary>
12	/// Реализация генератора сектора для подземелий.
13	/// </summary>
14	/// <seealso cref="ISectorGenerator" />
15	public class SectorGenerator : ISectorGenerator
16	{
17	private readonly IDiseaseGenerator _diseaseGenerator;
18	private readonly IMapFactorySelector _mapFactorySelector;
19	private readonly IMonsterGenerator _monsterGenerator;
20	private readonly IResourceMaterializationMap _resourceMaterializationMap;
21	private readonly ISectorFactory _sectorFactory;
22	private readonly IStaticObstaclesGenerator _staticObstaclesGenerator;
23
24	/// <summary>
25	/// Создаёт экземпляр <see cref="SectorGenerator" />.
26	/// </summary>
27	/// <param name="mapFactorySelector"> Сервис для выбора фабрики для создания карты. </param>
28	/// <param name="sectorFactory"> Фабрика сектора. </param>
29	/// <param name="monsterGenerator"> Генератор монстров для подземелий. </param>
30	public SectorGenerator(	10✔
31	IMapFactorySelector mapFactorySelector,	10✔
32	ISectorFactory sectorFactory,	10✔
33	IMonsterGenerator monsterGenerator,	10✔
34	IStaticObstaclesGenerator staticObstaclesGenerator,	10✔
35	IDiseaseGenerator diseaseGenerator,	10✔
36	IResourceMaterializationMap resourceMaterializationMap)	10✔
37	{
38	_mapFactorySelector = mapFactorySelector ?? throw new ArgumentNullException(nameof(mapFactorySelector));	10!
39	_sectorFactory = sectorFactory ?? throw new ArgumentNullException(nameof(sectorFactory));	10!
40	_monsterGenerator = monsterGenerator ?? throw new ArgumentNullException(nameof(monsterGenerator));	10!
41	_staticObstaclesGenerator = staticObstaclesGenerator ??	10!
42	throw new ArgumentNullException(nameof(staticObstaclesGenerator));	10✔
43	_diseaseGenerator = diseaseGenerator ?? throw new ArgumentNullException(nameof(diseaseGenerator));	10!
44	_resourceMaterializationMap = resourceMaterializationMap ??	10!
45	throw new ArgumentNullException(nameof(resourceMaterializationMap));	10✔
46	}	10✔
47
48	private void DefineDiseases(ISector sector)
49	{
50	var disease = _diseaseGenerator.Create();	17✔
51
52	if (disease is null)	17!
53	{
54	return;	17✔
55	}
56
UNCOV 57	sector.AddDisease(disease);	×
UNCOV 58	}	×
59
60	private async Task GenerateStaticObjectsAsync(
61	ISector sector,
62	ISectorSubScheme sectorScheme,
63	ISectorNode sectorNode)
64	{
65	var resourceDepositData = _resourceMaterializationMap.GetDepositData(sectorNode);
66	var context = new StaticObjectGenerationContext(sector, sectorScheme, resourceDepositData);
67
68	await _staticObstaclesGenerator.CreateAsync(context).ConfigureAwait(false);
69	}
70
71	/// <summary>
72	/// Создаёт экземпляр сектора подземелий с указанными параметрами.
73	/// </summary>
74	/// <param name="sectorNode"> Схема генерации сектора. </param>
75	/// <returns> Возвращает экземпляр сектора. </returns>
76	public async Task<ISector> GenerateAsync(ISectorNode sectorNode)
77	{
78	if (sectorNode is null)
79	{
80	throw new ArgumentNullException(nameof(sectorNode));
81	}
82
83	var mapFactory = _mapFactorySelector.GetMapFactory(sectorNode);
84
85	var transitions = MapFactoryHelper.CreateTransitions(sectorNode);
86
87	var mapGeneratorOptions = sectorNode.SectorScheme.MapGeneratorOptions;
88	if (mapGeneratorOptions is null)
89	{
90	throw new InvalidOperationException();
91	}
92
93	var sectorFactoryOptions = new SectorMapFactoryOptions(mapGeneratorOptions, transitions);
94
95	var map = await mapFactory.CreateAsync(sectorFactoryOptions).ConfigureAwait(false);
96
97	var locationScheme = sectorNode.Biome.LocationScheme;
98
99	var sector = _sectorFactory.Create(map, locationScheme);
100
101	DefineDiseases(sector);
102
103	var gameObjectRegions = map.Regions.Where(x => !x.IsStart).ToArray();
104
105	var sectorScheme = sectorNode.SectorScheme;
106
107	await GenerateStaticObjectsAsync(sector, sectorScheme, sectorNode).ConfigureAwait(false);
108
109	var monsterRegions = gameObjectRegions.ToArray();
110	_monsterGenerator.CreateMonsters(sector,
111	monsterRegions,
112	sectorScheme);
113
114	return sector;
115	}
116	}
117	}

kreghek / Zilon_Roguelike / 815989533

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