697590898

Build Type

github

Committed by GitHub

Commit Message

Merge c20ed0dc8 into 0a9d5c71e

Pull Request Pull Request #1069: Fix 966 automove

Run Details

2312 of 3734 branches covered (61.92%)

Branch coverage included in aggregate %.

81 of 122 new or added lines in 10 files covered. (66.39%)

18 existing lines in 10 files now uncovered.

6140 of 8052 relevant lines covered (76.25%)

38219.56 hits per line

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

94.79

/Zilon.Core/Zilon.Core/World/ResourceMaterializationMap.cs

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

using Zilon.Core.CommonServices.Dices;
using Zilon.Core.Graphs;

namespace Zilon.Core.World
{
    public sealed class ResourceMaterializationMap : IResourceMaterializationMap
    {
        private const float START_RESOURCE_SHARE = 0.10f;
        private readonly IDice _dice;

        private readonly Dictionary<ISectorNode, IResourceDepositData> _map;

        public ResourceMaterializationMap(IDice dice)
        {
            _dice = dice ?? throw new System.ArgumentNullException(nameof(dice));

            _map = new Dictionary<ISectorNode, IResourceDepositData>();
        }

        private ResourceDepositDataItem[] AddNewResourceIfNeed(ResourceDepositDataItem[] items)
        {
            var newRoll = _dice.RollD6();

            if (!items.Any() || newRoll > 3)
            {
                var itemsNew = new List<ResourceDepositDataItem>(items);
                var availableResources = new List<SectorResourceType>
                {
                    SectorResourceType.CherryBrushes,
                    SectorResourceType.Iron,
                    SectorResourceType.Stones,
                    SectorResourceType.WaterPuddles
                };

                foreach (var res in availableResources)
                {
                    var roll = _dice.RollD6();
                    if (roll == 6)
                    {
                        itemsNew.Add(new ResourceDepositDataItem(res, START_RESOURCE_SHARE));
                    }
                }

                items = itemsNew.ToArray();
            }

            return items;
        }

        private ResourceDepositDataItem[] CalcAverageResourceByNeightbors(IEnumerable<IGraphNode> neighborNodes)
        {
            var neighborResourceDatas = GetNeighborResourceData(neighborNodes);

            var dict = new Dictionary<SectorResourceType, List<float>>();
            foreach (var data1 in neighborResourceDatas)
            {
                foreach (var item in data1.Items)
                {
                    if (dict.TryGetValue(item.ResourceType, out var resourceShareList))
                    {
                        resourceShareList.Add(item.Share);
                    }
                    else
                    {
                        dict[item.ResourceType] = new List<float> { item.Share };
                    }
                }
            }

            var totalResources = new Dictionary<SectorResourceType, float>();
            foreach (var keyValue in dict)
            {
                totalResources[keyValue.Key] = keyValue.Value.Average();
                var diff = _dice.Roll(-25, 25) * 0.01f;
                var totalValue = totalResources[keyValue.Key] + diff;
                totalResources[keyValue.Key] = totalValue;

                if (totalValue < 0)
                {
                    totalResources.Remove(keyValue.Key);
                }
                else if (totalValue > 1)
                {
                    totalResources[keyValue.Key] = 1;
                }
            }

            var sumShare = totalResources.Values.Sum();
            if (sumShare > 1)
            {
                foreach (var keyValue in totalResources.ToArray())
                {
                    totalResources[keyValue.Key] = totalResources[keyValue.Key] / sumShare;
                }
            }

            var items = totalResources.Select(x => new ResourceDepositDataItem(x.Key, x.Value)).ToArray();
            return items;
        }

        private IResourceDepositData CalcCurrentResouceData(ISectorNode sectorNode)
        {
            var neighborNodes = sectorNode.Biome.GetNext(sectorNode);
            var items = CalcAverageResourceByNeightbors(neighborNodes);
            items = AddNewResourceIfNeed(items);

            var data = new ResourceDepositData(items);
            return data;
        }

        private static IResourceDepositData CreateStartResourceData()
        {
            var items = new[]
            {
                new ResourceDepositDataItem(SectorResourceType.Iron, START_RESOURCE_SHARE),
                new ResourceDepositDataItem(SectorResourceType.Stones, START_RESOURCE_SHARE),
                new ResourceDepositDataItem(SectorResourceType.WaterPuddles, START_RESOURCE_SHARE),
                new ResourceDepositDataItem(SectorResourceType.CherryBrushes, START_RESOURCE_SHARE)
            };
            var data = new ResourceDepositData(items);
            return data;
        }

        private IEnumerable<IResourceDepositData> GetNeighborResourceData(IEnumerable<IGraphNode> neighborNodes)
        {
            foreach (var node in neighborNodes.Cast<ISectorNode>())
            {
                if (_map.TryGetValue(node, out var data))
                {
                    yield return data;
                }
            }
        }

        public IResourceDepositData GetDepositData(ISectorNode sectorNode)
        {
            if (sectorNode is null)
            {
                throw new System.ArgumentNullException(nameof(sectorNode));
            }

            // Алгоритм.

            // Первое, что делаем, это проверяем, не является ли узел стартовым. То есть еще ничего нет.
            // В этом случае задаём случайные стартовые ресурсы.

            // Если не стартовый, тогда собираем данные с соседних, уже сгенерированных узлов.
            // Для каждого ресурса из соседних получаем усреднённое значение.
            // Затем, для каждого ресурса либо снижаем долю, либо увеличиваем.

            if (!_map.Any())
            {
                var data = CreateStartResourceData();

                _map[sectorNode] = data;

                return data;
            }
            else
            {
                var data = CalcCurrentResouceData(sectorNode);

                _map[sectorNode] = data;

                return data;
            }
        }
    }
}

1	using System.Collections.Generic;
2	using System.Linq;
3
4	using Zilon.Core.CommonServices.Dices;
5	using Zilon.Core.Graphs;
6
7	namespace Zilon.Core.World
8	{
9	public sealed class ResourceMaterializationMap : IResourceMaterializationMap
10	{
11	private const float START_RESOURCE_SHARE = 0.10f;
12	private readonly IDice _dice;
13
14	private readonly Dictionary<ISectorNode, IResourceDepositData> _map;
15
16	public ResourceMaterializationMap(IDice dice)	5✔
17	{
18	_dice = dice ?? throw new System.ArgumentNullException(nameof(dice));	5!
19
20	_map = new Dictionary<ISectorNode, IResourceDepositData>();	5✔
21	}	5✔
22
23	private ResourceDepositDataItem[] AddNewResourceIfNeed(ResourceDepositDataItem[] items)
24	{
25	var newRoll = _dice.RollD6();	105✔
26
27	if (!items.Any() \|\| newRoll > 3)	105✔
28	{
29	var itemsNew = new List<ResourceDepositDataItem>(items);	55✔
30	var availableResources = new List<SectorResourceType>	55✔
31	{	55✔
32	SectorResourceType.CherryBrushes,	55✔
33	SectorResourceType.Iron,	55✔
34	SectorResourceType.Stones,	55✔
35	SectorResourceType.WaterPuddles	55✔
36	};	55✔
37
38	foreach (var res in availableResources)	550✔
39	{
40	var roll = _dice.RollD6();	220✔
41	if (roll == 6)	220✔
42	{
43	itemsNew.Add(new ResourceDepositDataItem(res, START_RESOURCE_SHARE));	30✔
44	}
45	}
46
47	items = itemsNew.ToArray();	55✔
48	}
49
50	return items;	105✔
51	}
52
53	private ResourceDepositDataItem[] CalcAverageResourceByNeightbors(IEnumerable<IGraphNode> neighborNodes)
54	{
55	var neighborResourceDatas = GetNeighborResourceData(neighborNodes);	105✔
56
57	var dict = new Dictionary<SectorResourceType, List<float>>();	105✔
58	foreach (var data1 in neighborResourceDatas)	420✔
59	{
60	foreach (var item in data1.Items)	668✔
61	{
62	if (dict.TryGetValue(item.ResourceType, out var resourceShareList))	229✔
63	{
64	resourceShareList.Add(item.Share);	8✔
65	}
66	else
67	{
68	dict[item.ResourceType] = new List<float> { item.Share };	221✔
69	}
70	}
71	}
72
73	var totalResources = new Dictionary<SectorResourceType, float>();	105✔
74	foreach (var keyValue in dict)	652✔
75	{
76	totalResources[keyValue.Key] = keyValue.Value.Average();	221✔
77	var diff = _dice.Roll(-25, 25) * 0.01f;	221✔
78	var totalValue = totalResources[keyValue.Key] + diff;	221✔
79	totalResources[keyValue.Key] = totalValue;	221✔
80
81	if (totalValue < 0)	221✔
82	{
83	totalResources.Remove(keyValue.Key);	30✔
84	}
85	else if (totalValue > 1)	191!
86	{
UNCOV 87	totalResources[keyValue.Key] = 1;	×
88	}
89	}
90
91	var sumShare = totalResources.Values.Sum();	105✔
92	if (sumShare > 1)	105✔
93	{
94	foreach (var keyValue in totalResources.ToArray())	116✔
95	{
96	totalResources[keyValue.Key] = totalResources[keyValue.Key] / sumShare;	41✔
97	}
98	}
99
100	var items = totalResources.Select(x => new ResourceDepositDataItem(x.Key, x.Value)).ToArray();	105✔
101	return items;	105✔
102	}
103
104	private IResourceDepositData CalcCurrentResouceData(ISectorNode sectorNode)
105	{
106	var neighborNodes = sectorNode.Biome.GetNext(sectorNode);	105✔
107	var items = CalcAverageResourceByNeightbors(neighborNodes);	105✔
108	items = AddNewResourceIfNeed(items);	105✔
109
110	var data = new ResourceDepositData(items);	105✔
111	return data;	105✔
112	}
113
114	private static IResourceDepositData CreateStartResourceData()
115	{
116	var items = new[]	5✔
117	{	5✔
118	new ResourceDepositDataItem(SectorResourceType.Iron, START_RESOURCE_SHARE),	5✔
119	new ResourceDepositDataItem(SectorResourceType.Stones, START_RESOURCE_SHARE),	5✔
120	new ResourceDepositDataItem(SectorResourceType.WaterPuddles, START_RESOURCE_SHARE),	5✔
121	new ResourceDepositDataItem(SectorResourceType.CherryBrushes, START_RESOURCE_SHARE)	5✔
122	};	5✔
123	var data = new ResourceDepositData(items);	5✔
124	return data;	5✔
125	}
126
127	private IEnumerable<IResourceDepositData> GetNeighborResourceData(IEnumerable<IGraphNode> neighborNodes)
128	{
129	foreach (var node in neighborNodes.Cast<ISectorNode>())
130	{
131	if (_map.TryGetValue(node, out var data))
132	{
133	yield return data;
134	}
135	}
136	}
137
138	public IResourceDepositData GetDepositData(ISectorNode sectorNode)
139	{
140	if (sectorNode is null)	110!
141	{
142	throw new System.ArgumentNullException(nameof(sectorNode));	×
143	}
144
145	// Алгоритм.
146
147	// Первое, что делаем, это проверяем, не является ли узел стартовым. То есть еще ничего нет.
148	// В этом случае задаём случайные стартовые ресурсы.
149
150	// Если не стартовый, тогда собираем данные с соседних, уже сгенерированных узлов.
151	// Для каждого ресурса из соседних получаем усреднённое значение.
152	// Затем, для каждого ресурса либо снижаем долю, либо увеличиваем.
153
154	if (!_map.Any())	110✔
155	{
156	var data = CreateStartResourceData();	5✔
157
158	_map[sectorNode] = data;	5✔
159
160	return data;	5✔
161	}
162	else
163	{
164	var data = CalcCurrentResouceData(sectorNode);	105✔
165
166	_map[sectorNode] = data;	105✔
167
168	return data;	105✔
169	}
170	}
171	}
172	}

kreghek / Zilon_Roguelike / 697590898

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