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

Show customization ID (mostly for hairstyles), give a useful message if failing to get human.cmp and don't crash when getting null as clipboard data. Update to 0.0.7.4

Browse source
This commit is contained in:
Ottermandias 2022-02-11 17:29:25 +01:00
parent 767ddeb429
commit b141da40b0
7 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Glamourer.GameData/Customization/CustomizationOptions.cs
View file

@ -280,9 +280,19 @@ namespace Glamourer.Customization
internal CustomizationOptions(DalamudPluginInterface pi, DataManager gameData, ClientLanguage language)
{
_cmpFile = new CmpFile(gameData);
try
{
_cmpFile = new CmpFile(gameData);
}
catch (Exception e)
{
throw new Exception("READ THIS\n======== Could not obtain the human.cmp file which is necessary for color sets.\n"
+ "======== This usually indicates an error with your index files caused by TexTools modifications.\n"
+ "======== If you have used TexTools before, you will probably need to start over in it to use Glamourer.", e);
}
_customizeSheet = gameData.GetExcelSheet<CharaMakeCustomize>()!;
_lobby = gameData.GetExcelSheet<Lobby>()!;
_lobby = gameData.GetExcelSheet<Lobby>()!;
var tmp = gameData.Excel.GetType()!.GetMethod("GetSheet", BindingFlags.Instance | BindingFlags.NonPublic)!
.MakeGenericMethod(typeof(CharaMakeParams))!.Invoke(gameData.Excel, new object?[]
{

BIN
Glamourer.zip
View file

Binary file not shown.

4
Glamourer/Glamourer.csproj
View file

@ -5,8 +5,8 @@
<PlatformTarget>x64</PlatformTarget>
<RootNamespace>Glamourer</RootNamespace>
<AssemblyName>Glamourer</AssemblyName>
<FileVersion>0.0.7.3</FileVersion>
<AssemblyVersion>0.0.7.3</AssemblyVersion>
<FileVersion>0.0.7.4</FileVersion>
<AssemblyVersion>0.0.7.4</AssemblyVersion>
<Company>SoftOtter</Company>
<Product>Glamourer</Product>
<Copyright>Copyright © 2020</Copyright>

2
Glamourer/Glamourer.json
View file

@ -5,7 +5,7 @@
"Description": "Adds functionality to change and store appearance of players, customization and equip. Requires Penumbra to be installed and activated to work. Can also add preview options to the Changed Items tab for Penumbra.",
"Tags": [ "Appearance", "Glamour", "Race", "Outfit", "Armor", "Clothes", "Skins", "Customization", "Design", "Character" ],
"InternalName": "Glamourer",
"AssemblyVersion": "0.0.7.3",
"AssemblyVersion": "0.0.7.4",
"RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any",
"DalamudApiLevel": 5,

7
Glamourer/Gui/InterfaceActorPanel.cs
View file

@ -91,12 +91,11 @@ namespace Glamourer.Gui
if (!applyButton)
return false;
var text = ImGui.GetClipboardText();
if (!text.Any())
return false;
try
{
var text = ImGui.GetClipboardText();
if (!text.Any())
return false;
var save = CharacterSave.FromString(text);
ConditionalApply(save, _player!);
}

8
Glamourer/Gui/InterfaceCustomization.cs
View file

@ -221,6 +221,7 @@ namespace Glamourer.Gui
{
var custom = set.Data(id, i);
var icon = Glamourer.Customization.GetIcon(custom.IconId);
ImGui.BeginGroup();
if (ImGui.ImageButton(icon.ImGuiHandle, _iconSize))
{
value = custom;
@ -234,6 +235,11 @@ namespace Glamourer.Gui
ImGui.Image(icon.ImGuiHandle, new Vector2(icon.Width, icon.Height));
}
var text = custom.Value.ToString();
var textWidth = ImGui.CalcTextSize(text).X;
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (_iconSize.X - textWidth + 2 * ImGui.GetStyle().FramePadding.X)/2);
ImGui.Text(text);
ImGui.EndGroup();
if (i % 8 != 7)
ImGui.SameLine();
}
@ -285,7 +291,7 @@ namespace Glamourer.Gui
if (id == CustomizationId.Hairstyle && customization.Race == Race.Hrothgar)
customization[CustomizationId.Face] = (byte) ((customization[CustomizationId.Hairstyle] + 1) / 2);
ImGui.Text(label);
ImGui.Text($"{label} ({custom.Value.Value})");
ImGuiCustom.HoverTooltip(tooltip);
return ret;

4
repo.json
View file

@ -6,8 +6,8 @@
"Description": "Adds functionality to change and store appearance of players, customization and equip. Requires Penumbra to be installed and activated to work. Can also add preview options to the Changed Items tab for Penumbra.",
"Tags": [ "Appearance", "Glamour", "Race", "Outfit", "Armor", "Clothes", "Skins", "Customization", "Design", "Character" ],
"InternalName": "Glamourer",
"AssemblyVersion": "0.0.7.3",
"TestingAssemblyVersion": "0.0.7.3",
"AssemblyVersion": "0.0.7.4",
"TestingAssemblyVersion": "0.0.7.4",
"RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any",
"DalamudApiLevel": 5,