916818582

Build Type

github

Committed by GitHub

Commit Message

Merge 81544f599 into 703433632

Pull Request Pull Request #1177: Equip and use command

Run Details

1928 of 3692 branches covered (52.22%)

Branch coverage included in aggregate %.

0 of 3 new or added lines in 2 files covered. (0.0%)

1 existing line in 1 file now uncovered.

4954 of 7832 relevant lines covered (63.25%)

20966.45 hits per line

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

0.0

/Zilon.Core/Zilon.Core/PersonGeneration/FullPersonFactoryBase.cs

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

using Zilon.Core.CommonServices.Dices;
using Zilon.Core.PersonModules;
using Zilon.Core.Persons;
using Zilon.Core.Props;
using Zilon.Core.Schemes;
using Zilon.Core.Scoring;
using Zilon.Core.Tactics;

namespace Zilon.Core.PersonGeneration
{
    public abstract class FullPersonFactoryBase : IPersonFactory
    {
        private readonly IPersonPerkInitializator _personPerkInitializator;
        private readonly IPropFactory _propFactory;
        private readonly ISurvivalRandomSource _survivalRandomSource;

        [ExcludeFromCodeCoverage]
        protected FullPersonFactoryBase(
            ISchemeService schemeService,
            ISurvivalRandomSource survivalRandomSource,
            IPropFactory propFactory,
            IDropResolver dropResolver,
            IPersonPerkInitializator personPerkInitializator,
            IDice dice)
        {
            SchemeService = schemeService ?? throw new ArgumentNullException(nameof(schemeService));
            _survivalRandomSource =
                survivalRandomSource ?? throw new ArgumentNullException(nameof(survivalRandomSource));
            _propFactory = propFactory ?? throw new ArgumentNullException(nameof(propFactory));
            DropResolver = dropResolver ?? throw new ArgumentNullException(nameof(dropResolver));
            _personPerkInitializator = personPerkInitializator ??
                                       throw new ArgumentNullException(nameof(personPerkInitializator));
            Dice = dice ?? throw new ArgumentNullException(nameof(dice));
        }

        protected static int BodySlotIndex => 1;

        protected IDice Dice { get; }

        protected IDropResolver DropResolver { get; }

        protected static int HeadSlotIndex => 0;

        protected static int MainHandSlotIndex => 2;

        protected static int OffHandSlotIndex => 3;

        protected ISchemeService SchemeService { get; }

        protected void AddDefaultProps(IInventoryModule inventory)
        {
            AddResource(inventory, "packed-food", 1);
            AddResource(inventory, "water-bottle", 1);
            AddResource(inventory, "med-kit", 1);
            AddEquipment(inventory, "short-sword");
            AddEquipment(inventory, "traveler-camisole");
        }

        protected static void AddEquipment(IEquipmentModule equipmentModule, int slotIndex, Equipment equipment)
        {
            if (equipmentModule is null)
            {
                throw new ArgumentNullException(nameof(equipmentModule));
            }

            equipmentModule[slotIndex] = equipment;
        }

        protected void AddEquipment(IInventoryModule inventory, string sid)
        {
            var scheme = SchemeService.GetScheme<IPropScheme>(sid);
            var prop = _propFactory.CreateEquipment(scheme);
            AddPropToInventory(inventory, prop);
        }

        protected static void AddPropToInventory(IPropStore inventory, IProp prop)
        {
            if (inventory is null)
            {
                throw new ArgumentNullException(nameof(inventory));
            }

            inventory.Add(prop);
        }

        protected void AddResource(IInventoryModule inventory, string resourceSid, int count)
        {
            if (inventory is null)
            {
                throw new ArgumentNullException(nameof(inventory));
            }

            try
            {
                var resourceScheme = SchemeService.GetScheme<IPropScheme>(resourceSid);
                var resource = _propFactory.CreateResource(resourceScheme, count);
                inventory.Add(resource);
            }
            catch (KeyNotFoundException exception)
            {
                throw new CreatePersonException($"Не найден объект {resourceSid}", exception);
            }
        }

        protected void FillSlot(HumanPerson person, IDropTableScheme? dropScheme, int slotIndex)
        {
            if (dropScheme is null)
            {
                return;
            }

            // Генерируем предметы.
            // Выбираем предмет, как экипировку в слот.
            // Если он может быть экипирован, то устанавливаем в слот.
            // Остальные дропнутые предметы складываем просто в инвентарь.
            // Если текущий предмет невозможно экипировать, то его тоже помещаем в инвентарь.

            var inventory = person.GetModule<IInventoryModule>();
            var dropedProps = DropResolver.Resolve(new[] { dropScheme });
            var usedEquipment = dropedProps.OfType<Equipment>().FirstOrDefault();
            if (usedEquipment != null)
            {
                var equipmentModule = person.GetModule<IEquipmentModule>();
                var canBeEquiped = CanBeEquiped(equipmentModule, slotIndex, usedEquipment);
                if (canBeEquiped)
                {
                    AddEquipment(equipmentModule, slotIndex, usedEquipment);
                    var unusedMainWeaponDrops = dropedProps.Where(x => x != usedEquipment).ToArray();
                    foreach (var prop in unusedMainWeaponDrops)
                    {
                        AddPropToInventory(inventory, prop);
                    }
                }
                else
                {
                    foreach (var prop in dropedProps)
                    {
                        AddPropToInventory(inventory, prop);
                    }
                }
            }
            else
            {
                foreach (var prop in dropedProps)
                {
                    AddPropToInventory(inventory, prop);
                }
            }
        }

        protected abstract void RollStartEquipment(IInventoryModule inventory, HumanPerson person);

        private static bool CanBeEquiped(
            IEquipmentModule equipmentModule,
            int slotIndex,
            Equipment equipment)
        {
            return EquipmentCarrierHelper.CanBeEquiped(equipmentModule, slotIndex, equipment);
        }

        private IAttributesModule RollAndAddPersonAttributesToPerson(IPerson person)
        {
            var attributes = new[]
            {
                RollAttribute(PersonAttributeType.PhysicalStrength),
                RollAttribute(PersonAttributeType.Dexterity),
                RollAttribute(PersonAttributeType.Perception),
                RollAttribute(PersonAttributeType.Constitution)
            };

            var attributesModule = new AttributesModule(attributes);

            person.AddModule(attributesModule);

            return attributesModule;
        }

        private PersonAttribute RollAttribute(PersonAttributeType attributeType)
        {
            var value = 10 + Dice.Roll(-4, 4);
            return new PersonAttribute(attributeType, value);
        }

        private void RollTraitPerks(IEvolutionModule evolutionData)
        {
            if (evolutionData is null)
            {
                throw new ArgumentNullException(nameof(evolutionData));
            }

            var rolledTraits = _personPerkInitializator.Generate();
            evolutionData.AddBuildInPerks(rolledTraits);
        }

        public IPlayerEventLogService? PlayerEventLogService { get; set; }

        public IPerson Create(string personSchemeSid, IFraction fraction)
        {
            var personScheme = SchemeService.GetScheme<IPersonScheme>(personSchemeSid);

            var person = new HumanPerson(personScheme, fraction);

            var attributeModule = RollAndAddPersonAttributesToPerson(person);

            var movingModule = new MovingModule(attributeModule);
            person.AddModule(movingModule);

            var inventoryModule = new InventoryModule();
            person.AddModule(inventoryModule);

            var notNullSlots = personScheme.Slots.Select(x => x!).ToArray();
            var equipmentModule = new EquipmentModule(notNullSlots);
            person.AddModule(equipmentModule);

            var effectsModule = new ConditionsModule();
            person.AddModule(effectsModule);

            var evolutionModule = new EvolutionModule(SchemeService);
            person.AddModule(evolutionModule);
            RollTraitPerks(evolutionModule);

            var survivalModule = new HumanSurvivalModule(personScheme, _survivalRandomSource, attributeModule,
                effectsModule, evolutionModule, equipmentModule)
            {
                PlayerEventLogService = PlayerEventLogService
            };
            person.AddModule(survivalModule);

            RollStartEquipment(inventoryModule, person);

            if (person.Scheme.DefaultAct is null)
            {
                throw new InvalidOperationException();
            }

            var defaultActScheme = SchemeService.GetScheme<ITacticalActScheme>(person.Scheme.DefaultAct);
            var combatActModule = new CombatActModule(
                defaultActScheme,
                equipmentModule,
                effectsModule,
                evolutionModule);

            person.AddModule(combatActModule);

            var combatStatsModule = new CombatStatsModule(evolutionModule, equipmentModule);
            person.AddModule(combatStatsModule);

            var diseaseModule = new DiseaseModule(effectsModule);
            person.AddModule(diseaseModule);

            var fowModule = new FowData();
            person.AddModule(fowModule);

            person.PlayerEventLogService = PlayerEventLogService;

            return person;
        }
    }
}

1	using System;
2	using System.Collections.Generic;
3	using System.Diagnostics.CodeAnalysis;
4	using System.Linq;
5
6	using Zilon.Core.CommonServices.Dices;
7	using Zilon.Core.PersonModules;
8	using Zilon.Core.Persons;
9	using Zilon.Core.Props;
10	using Zilon.Core.Schemes;
11	using Zilon.Core.Scoring;
12	using Zilon.Core.Tactics;
13
14	namespace Zilon.Core.PersonGeneration
15	{
16	public abstract class FullPersonFactoryBase : IPersonFactory
17	{
18	private readonly IPersonPerkInitializator _personPerkInitializator;
19	private readonly IPropFactory _propFactory;
20	private readonly ISurvivalRandomSource _survivalRandomSource;
21
22	[ExcludeFromCodeCoverage]
23	protected FullPersonFactoryBase(
24	ISchemeService schemeService,
25	ISurvivalRandomSource survivalRandomSource,
26	IPropFactory propFactory,
27	IDropResolver dropResolver,
28	IPersonPerkInitializator personPerkInitializator,
29	IDice dice)
30	{
31	SchemeService = schemeService ?? throw new ArgumentNullException(nameof(schemeService));
32	_survivalRandomSource =
33	survivalRandomSource ?? throw new ArgumentNullException(nameof(survivalRandomSource));
34	_propFactory = propFactory ?? throw new ArgumentNullException(nameof(propFactory));
35	DropResolver = dropResolver ?? throw new ArgumentNullException(nameof(dropResolver));
36	_personPerkInitializator = personPerkInitializator ??
37	throw new ArgumentNullException(nameof(personPerkInitializator));
38	Dice = dice ?? throw new ArgumentNullException(nameof(dice));
39	}
40
41	protected static int BodySlotIndex => 1;	×
42
43	protected IDice Dice { get; }
44
45	protected IDropResolver DropResolver { get; }
46
47	protected static int HeadSlotIndex => 0;	×
48
49	protected static int MainHandSlotIndex => 2;	×
50
51	protected static int OffHandSlotIndex => 3;	×
52
53	protected ISchemeService SchemeService { get; }
54
55	protected void AddDefaultProps(IInventoryModule inventory)
56	{
57	AddResource(inventory, "packed-food", 1);	×
58	AddResource(inventory, "water-bottle", 1);	×
59	AddResource(inventory, "med-kit", 1);	×
NEW 60	AddEquipment(inventory, "short-sword");	×
NEW 61	AddEquipment(inventory, "traveler-camisole");	×
UNCOV 62	}	×
63
64	protected static void AddEquipment(IEquipmentModule equipmentModule, int slotIndex, Equipment equipment)
65	{
66	if (equipmentModule is null)	×
67	{
68	throw new ArgumentNullException(nameof(equipmentModule));	×
69	}
70
71	equipmentModule[slotIndex] = equipment;	×
72	}	×
73
74	protected void AddEquipment(IInventoryModule inventory, string sid)
75	{
76	var scheme = SchemeService.GetScheme<IPropScheme>(sid);	×
77	var prop = _propFactory.CreateEquipment(scheme);	×
78	AddPropToInventory(inventory, prop);	×
79	}	×
80
81	protected static void AddPropToInventory(IPropStore inventory, IProp prop)
82	{
83	if (inventory is null)	×
84	{
85	throw new ArgumentNullException(nameof(inventory));	×
86	}
87
88	inventory.Add(prop);	×
89	}	×
90
91	protected void AddResource(IInventoryModule inventory, string resourceSid, int count)
92	{
93	if (inventory is null)	×
94	{
95	throw new ArgumentNullException(nameof(inventory));	×
96	}
97
98	try
99	{
100	var resourceScheme = SchemeService.GetScheme<IPropScheme>(resourceSid);	×
101	var resource = _propFactory.CreateResource(resourceScheme, count);	×
102	inventory.Add(resource);	×
103	}	×
104	catch (KeyNotFoundException exception)	×
105	{
106	throw new CreatePersonException($"Не найден объект {resourceSid}", exception);	×
107	}
108	}	×
109
110	protected void FillSlot(HumanPerson person, IDropTableScheme? dropScheme, int slotIndex)
111	{
112	if (dropScheme is null)	×
113	{
114	return;	×
115	}
116
117	// Генерируем предметы.
118	// Выбираем предмет, как экипировку в слот.
119	// Если он может быть экипирован, то устанавливаем в слот.
120	// Остальные дропнутые предметы складываем просто в инвентарь.
121	// Если текущий предмет невозможно экипировать, то его тоже помещаем в инвентарь.
122
123	var inventory = person.GetModule<IInventoryModule>();	×
124	var dropedProps = DropResolver.Resolve(new[] { dropScheme });	×
125	var usedEquipment = dropedProps.OfType<Equipment>().FirstOrDefault();	×
126	if (usedEquipment != null)	×
127	{
128	var equipmentModule = person.GetModule<IEquipmentModule>();	×
129	var canBeEquiped = CanBeEquiped(equipmentModule, slotIndex, usedEquipment);	×
130	if (canBeEquiped)	×
131	{
132	AddEquipment(equipmentModule, slotIndex, usedEquipment);	×
133	var unusedMainWeaponDrops = dropedProps.Where(x => x != usedEquipment).ToArray();	×
134	foreach (var prop in unusedMainWeaponDrops)	×
135	{
136	AddPropToInventory(inventory, prop);	×
137	}
138	}
139	else
140	{
141	foreach (var prop in dropedProps)	×
142	{
143	AddPropToInventory(inventory, prop);	×
144	}
145	}
146	}
147	else
148	{
149	foreach (var prop in dropedProps)	×
150	{
151	AddPropToInventory(inventory, prop);	×
152	}
153	}
154	}	×
155
156	protected abstract void RollStartEquipment(IInventoryModule inventory, HumanPerson person);
157
158	private static bool CanBeEquiped(
159	IEquipmentModule equipmentModule,
160	int slotIndex,
161	Equipment equipment)
162	{
163	return EquipmentCarrierHelper.CanBeEquiped(equipmentModule, slotIndex, equipment);	×
164	}
165
166	private IAttributesModule RollAndAddPersonAttributesToPerson(IPerson person)
167	{
168	var attributes = new[]	×
169	{	×
170	RollAttribute(PersonAttributeType.PhysicalStrength),	×
171	RollAttribute(PersonAttributeType.Dexterity),	×
172	RollAttribute(PersonAttributeType.Perception),	×
173	RollAttribute(PersonAttributeType.Constitution)	×
174	};	×
175
176	var attributesModule = new AttributesModule(attributes);	×
177
178	person.AddModule(attributesModule);	×
179
180	return attributesModule;	×
181	}
182
183	private PersonAttribute RollAttribute(PersonAttributeType attributeType)
184	{
185	var value = 10 + Dice.Roll(-4, 4);	×
186	return new PersonAttribute(attributeType, value);	×
187	}
188
189	private void RollTraitPerks(IEvolutionModule evolutionData)
190	{
191	if (evolutionData is null)	×
192	{
193	throw new ArgumentNullException(nameof(evolutionData));	×
194	}
195
196	var rolledTraits = _personPerkInitializator.Generate();	×
197	evolutionData.AddBuildInPerks(rolledTraits);	×
198	}	×
199
200	public IPlayerEventLogService? PlayerEventLogService { get; set; }
201
202	public IPerson Create(string personSchemeSid, IFraction fraction)
203	{
204	var personScheme = SchemeService.GetScheme<IPersonScheme>(personSchemeSid);	×
205
206	var person = new HumanPerson(personScheme, fraction);	×
207
208	var attributeModule = RollAndAddPersonAttributesToPerson(person);	×
209
210	var movingModule = new MovingModule(attributeModule);	×
211	person.AddModule(movingModule);	×
212
213	var inventoryModule = new InventoryModule();	×
214	person.AddModule(inventoryModule);	×
215
216	var notNullSlots = personScheme.Slots.Select(x => x!).ToArray();	×
217	var equipmentModule = new EquipmentModule(notNullSlots);	×
218	person.AddModule(equipmentModule);	×
219
220	var effectsModule = new ConditionsModule();	×
221	person.AddModule(effectsModule);	×
222
223	var evolutionModule = new EvolutionModule(SchemeService);	×
224	person.AddModule(evolutionModule);	×
225	RollTraitPerks(evolutionModule);	×
226
227	var survivalModule = new HumanSurvivalModule(personScheme, _survivalRandomSource, attributeModule,	×
228	effectsModule, evolutionModule, equipmentModule)	×
229	{	×
230	PlayerEventLogService = PlayerEventLogService	×
231	};	×
232	person.AddModule(survivalModule);	×
233
234	RollStartEquipment(inventoryModule, person);	×
235
236	if (person.Scheme.DefaultAct is null)	×
237	{
238	throw new InvalidOperationException();	×
239	}
240
241	var defaultActScheme = SchemeService.GetScheme<ITacticalActScheme>(person.Scheme.DefaultAct);	×
242	var combatActModule = new CombatActModule(	×
243	defaultActScheme,	×
244	equipmentModule,	×
245	effectsModule,	×
246	evolutionModule);	×
247
248	person.AddModule(combatActModule);	×
249
250	var combatStatsModule = new CombatStatsModule(evolutionModule, equipmentModule);	×
251	person.AddModule(combatStatsModule);	×
252
253	var diseaseModule = new DiseaseModule(effectsModule);	×
254	person.AddModule(diseaseModule);	×
255
256	var fowModule = new FowData();	×
257	person.AddModule(fowModule);	×
258
259	person.PlayerEventLogService = PlayerEventLogService;	×
260
261	return person;	×
262	}
263	}
264	}

kreghek / Zilon_Roguelike / 916818582

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