ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update for new Penumbra changes for glamourer rework, make auto name for fixed design sane.

Browse source
This commit is contained in:
Ottermandias 2023-06-11 00:16:49 +02:00
parent d167d798d7
commit 067a9d8038
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Glamourer/Gui/InterfaceEquipment.cs
View file

@ -1,4 +1,6 @@
using System.Linq; using System.Collections;
using System.Collections.Generic;
using System.Linq;
using ImGuiNET; using ImGuiNET;
using Lumina.Text; using Lumina.Text;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
@ -133,10 +135,19 @@ namespace Glamourer.Gui
{ {
0 => SmallClothes, 0 => SmallClothes,
9903 => SmallClothesNpc, 9903 => SmallClothesNpc,
_ => _identifier.Identify(set, weapon, variant, slot.ToSlot()).FirstOrDefault() ?? Unknown, _ => ToItem(_identifier.Identify(set, weapon, variant, slot.ToSlot())),
}; };
} }
private Lumina.Excel.GeneratedSheets.Item ToItem(IEnumerable<EquipItem> items)
{
var item = items.FirstOrDefault();
if (item.Valid)
return Dalamud.GameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.Item>()!.GetRow(item.Id) ?? Unknown;
return Unknown;
}
private bool DrawEquipSlot(EquipSlot slot, CharacterArmor equip) private bool DrawEquipSlot(EquipSlot slot, CharacterArmor equip)
{ {
var (equipCombo, stainCombo) = _combos[slot]; var (equipCombo, stainCombo) = _combos[slot];

9
Glamourer/Gui/InterfaceFixedDesigns.cs
View file

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Numerics;
using Dalamud.Interface; using Dalamud.Interface;
using Glamourer.Designs; using Glamourer.Designs;
using Glamourer.FileSystem; using Glamourer.FileSystem;
@ -130,12 +129,8 @@ namespace Glamourer.Gui
_newFixDesignGroup = _plugin.FixedDesigns.JobGroups[1]; _newFixDesignGroup = _plugin.FixedDesigns.JobGroups[1];
} }
if (_newFixCharacterName == string.Empty) { if (_newFixCharacterName == string.Empty)
var player = CharacterFactory.Convert(Dalamud.Objects[0]); _newFixCharacterName = Dalamud.ClientState.LocalPlayer?.Name.ToString() ?? string.Empty;
if (player != null)
_newFixCharacterName = player.Name.ToString();
}
raii.PopFonts(); raii.PopFonts();
ImGui.TableNextColumn(); ImGui.TableNextColumn();