1071339023

Build Type

github

Committed by GitHub

Commit Message

Merge 1c459a800 into 4d5f739d9

Pull Request Pull Request #1233: Balance remove unlogical props

Run Details

1972 of 3779 branches covered (52.18%)

Branch coverage included in aggregate %.

12 of 13 new or added lines in 3 files covered. (92.31%)

2 existing lines in 1 file now uncovered.

4872 of 7748 relevant lines covered (62.88%)

36187.74 hits per line

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

90.22

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

﻿using System;
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 = 1f;
        private readonly IDice _dice;

        private readonly Dictionary<ISectorNode, IResourceDepositData> _map;

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

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

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

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

kreghek / Zilon_Roguelike / 1071339023

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