ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-02-18 21:47:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Maybe fix weapon behavior with multiple restricted designs with identical weapon types.

Browse source
This commit is contained in:
Ottermandias 2024-03-28 15:23:19 +01:00
parent 71d6a658d6
commit 3d421881f6
12 changed files with 104 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Glamourer/State/StateEditor.cs
View file

@ -298,7 +298,7 @@ public class StateEditor(
}
var currentType = state.BaseData.Item(weaponSlot).Type;
if (mergedDesign.Weapons.TryGetValue(currentType, out var weapon))
if (mergedDesign.Weapons.TryGet(currentType, state.LastJob, out var weapon))
{
var source = settings.UseSingleSource ? settings.Source :
weapon.Item2 is StateSource.Game ? StateSource.Game : settings.Source;
@ -311,7 +311,7 @@ public class StateEditor(
if (settings.FromJobChange)
jobChange.Set(state, mergedDesign.Weapons.Values.Select(m =>
(m.Item1, settings.UseSingleSource ? settings.Source :
m.Item2 is StateSource.Game ? StateSource.Game : settings.Source)));
m.Item2 is StateSource.Game ? StateSource.Game : settings.Source, m.Item3)));
foreach (var meta in MetaExtensions.AllRelevant.Where(mergedDesign.Design.DoApplyMeta))
{