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

Fix eye colors, color selectors and Begin/End.

Browse source
This commit is contained in:
Ottermandias 2021-09-17 13:39:27 +02:00
parent f2c3bc35c3
commit c3d0d24713
8 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Glamourer.GameData/Customization/CustomName.cs
View file

@ -8,6 +8,7 @@
OddEyes, OddEyes,
IrisSmall, IrisSmall,
IrisLarge, IrisLarge,
IrisSize,
MidlanderM, MidlanderM,
HighlanderM, HighlanderM,
WildwoodM, WildwoodM,

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

@ -191,7 +191,7 @@ namespace Glamourer.Customization
set.FeaturesTattoos = featureDict; set.FeaturesTattoos = featureDict;
set.OptionName = ((CustomizationId[]) Enum.GetValues(typeof(CustomizationId))).Select(c => var nameArray = ((CustomizationId[]) Enum.GetValues(typeof(CustomizationId))).Select(c =>
{ {
var menu = row.Menus var menu = row.Menus
.Cast<CharaMakeParams.Menu?>() .Cast<CharaMakeParams.Menu?>()
@ -211,14 +211,19 @@ namespace Glamourer.Customization
var textRow = _lobby.GetRow(menu.Value.Id); var textRow = _lobby.GetRow(menu.Value.Id);
return textRow?.Text.ToString() ?? c.ToDefaultName(); return textRow?.Text.ToString() ?? c.ToDefaultName();
}).ToArray(); }).ToArray();
nameArray[(int) CustomizationId.EyeColorL] = nameArray[(int) CustomizationId.EyeColorR];
nameArray[(int) CustomizationId.EyeColorR] = GetName(CustomName.OddEyes);
set.OptionName = nameArray;
set.Types = ((CustomizationId[]) Enum.GetValues(typeof(CustomizationId))).Select(c => set.Types = ((CustomizationId[]) Enum.GetValues(typeof(CustomizationId))).Select(c =>
{ {
if (c == CustomizationId.HighlightColor) switch (c)
return CharaMakeParams.MenuType.ColorPicker; {
case CustomizationId.HighlightColor:
if (c == CustomizationId.EyeColorL) case CustomizationId.EyeColorL:
return CharaMakeParams.MenuType.ColorPicker; case CustomizationId.EyeColorR:
return CharaMakeParams.MenuType.ColorPicker;
}
var menu = row.Menus var menu = row.Menus
.Cast<CharaMakeParams.Menu?>() .Cast<CharaMakeParams.Menu?>()
@ -297,6 +302,7 @@ namespace Glamourer.Customization
_names[(int) CustomName.OddEyes] = _lobby.GetRow(2125)?.Text ?? "Odd Eyes"; _names[(int) CustomName.OddEyes] = _lobby.GetRow(2125)?.Text ?? "Odd Eyes";
_names[(int) CustomName.IrisSmall] = _lobby.GetRow(1076)?.Text ?? "Small"; _names[(int) CustomName.IrisSmall] = _lobby.GetRow(1076)?.Text ?? "Small";
_names[(int) CustomName.IrisLarge] = _lobby.GetRow(1075)?.Text ?? "Large"; _names[(int) CustomName.IrisLarge] = _lobby.GetRow(1075)?.Text ?? "Large";
_names[(int) CustomName.IrisSize] = _lobby.GetRow(244)?.Text ?? "Iris Size";
_names[(int) CustomName.MidlanderM] = subRace.GetRow((int) SubRace.Midlander)?.Masculine.ToString() ?? SubRace.Midlander.ToName(); _names[(int) CustomName.MidlanderM] = subRace.GetRow((int) SubRace.Midlander)?.Masculine.ToString() ?? SubRace.Midlander.ToName();
_names[(int) CustomName.MidlanderF] = subRace.GetRow((int) SubRace.Midlander)?.Feminine.ToString() ?? SubRace.Midlander.ToName(); _names[(int) CustomName.MidlanderF] = subRace.GetRow((int) SubRace.Midlander)?.Feminine.ToString() ?? SubRace.Midlander.ToName();
_names[(int) CustomName.HighlanderM] = _names[(int) CustomName.HighlanderM] =

BIN
Glamourer.zip
View file

Binary file not shown.

4
Glamourer/Glamourer.csproj
View file

@ -5,8 +5,8 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<RootNamespace>Glamourer</RootNamespace> <RootNamespace>Glamourer</RootNamespace>
<AssemblyName>Glamourer</AssemblyName> <AssemblyName>Glamourer</AssemblyName>
<FileVersion>0.0.5.0</FileVersion> <FileVersion>0.0.5.1</FileVersion>
<AssemblyVersion>0.0.5.0</AssemblyVersion> <AssemblyVersion>0.0.5.1</AssemblyVersion>
<Company>SoftOtter</Company> <Company>SoftOtter</Company>
<Product>Glamourer</Product> <Product>Glamourer</Product>
<Copyright>Copyright © 2020</Copyright> <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.", "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"], "Tags": ["Appearance", "Glamour", "Race", "Outfit", "Armor", "Clothes", "Skins", "Customization", "Design", "Character"],
"InternalName": "Glamourer", "InternalName": "Glamourer",
"AssemblyVersion": "0.0.5.0", "AssemblyVersion": "0.0.5.1",
"RepoUrl": "https://github.com/Ottermandias/Glamourer", "RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 4, "DalamudApiLevel": 4,

3
Glamourer/Gui/Interface.cs
View file

@ -69,7 +69,10 @@ namespace Glamourer.Gui
ImGui.SetNextWindowSizeConstraints(Vector2.One * MinWindowWidth * ImGui.GetIO().FontGlobalScale, ImGui.SetNextWindowSizeConstraints(Vector2.One * MinWindowWidth * ImGui.GetIO().FontGlobalScale,
Vector2.One * 5000 * ImGui.GetIO().FontGlobalScale); Vector2.One * 5000 * ImGui.GetIO().FontGlobalScale);
if (!ImGui.Begin(_glamourerHeader, ref _visible)) if (!ImGui.Begin(_glamourerHeader, ref _visible))
{
ImGui.End();
return; return;
}
try try
{ {

17
Glamourer/Gui/InterfaceCustomization.cs
View file

@ -52,7 +52,7 @@ namespace Glamourer.Gui
var ret = false; var ret = false;
var tmp = value + 1; var tmp = value + 1;
ImGui.SetNextItemWidth(_inputIntSize); ImGui.SetNextItemWidth(_inputIntSize);
if (ImGui.InputInt(label, ref tmp, 1) && tmp != value + 1 && tmp >= minValue && tmp <= maxValue) if (ImGui.InputInt(label, ref tmp, 1, 1, ImGuiInputTextFlags.EnterReturnsTrue) && tmp != value + 1 && tmp >= minValue && tmp <= maxValue)
{ {
value = tmp - 1; value = tmp - 1;
ret = true; ret = true;
@ -97,7 +97,7 @@ namespace Glamourer.Gui
{ {
if (InputInt($"##text_{id}", ref current, 1, count)) if (InputInt($"##text_{id}", ref current, 1, count))
{ {
customization[id] = set.Data(id, current - 1).Value; customization[id] = set.Data(id, current).Value;
ret = true; ret = true;
} }
@ -394,7 +394,16 @@ namespace Glamourer.Gui
return false; return false;
} }
private static readonly CustomizationId[] AllCustomizations = (CustomizationId[]) Enum.GetValues(typeof(CustomizationId)); private static CustomizationId[] GetCustomizationOrder()
{
var ret = (CustomizationId[])Enum.GetValues(typeof(CustomizationId));
ret[(int) CustomizationId.TattooColor] = CustomizationId.EyeColorL;
ret[(int) CustomizationId.EyeColorL] = CustomizationId.EyeColorR;
ret[(int) CustomizationId.EyeColorR] = CustomizationId.TattooColor;
return ret;
}
private static readonly CustomizationId[] AllCustomizations = GetCustomizationOrder();
private bool DrawCustomization(ref CharacterCustomization custom) private bool DrawCustomization(ref CharacterCustomization custom)
{ {
@ -457,7 +466,7 @@ namespace Glamourer.Gui
} }
tmp = custom.SmallIris; tmp = custom.SmallIris;
if (ImGui.Checkbox($"{Glamourer.Customization.GetName(CustomName.IrisSmall)} {set.Option(CustomizationId.EyeColorL)}", if (ImGui.Checkbox($"{Glamourer.Customization.GetName(CustomName.IrisSmall)} {Glamourer.Customization.GetName(CustomName.IrisSize)}",
ref tmp) ref tmp)
&& tmp != custom.SmallIris) && tmp != custom.SmallIris)
{ {

4
repo.json
View file

@ -4,8 +4,8 @@
"Name": "Glamourer", "Name": "Glamourer",
"Description": "Adds functionality to change appearance of players. Requires Penumbra to be installed and activated to work.", "Description": "Adds functionality to change appearance of players. Requires Penumbra to be installed and activated to work.",
"InternalName": "Glamourer", "InternalName": "Glamourer",
"AssemblyVersion": "0.0.5.0", "AssemblyVersion": "0.0.5.1",
"TestingAssemblyVersion": "0.0.5.0", "TestingAssemblyVersion": "0.0.5.1",
"RepoUrl": "https://github.com/Ottermandias/Glamourer", "RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 4, "DalamudApiLevel": 4,