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

0.1.1.4, small fixes for PRs.

Browse source
This commit is contained in:
Ottermandias 2023-01-23 12:48:04 +01:00
parent 8940e813ec
commit 415e58b93e
9 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Glamourer.GameData/CharacterEquipExtensions.cs
View file

@ -22,7 +22,9 @@ namespace Glamourer
if (variant.HasValue) if (variant.HasValue)
*(ushort*) (address + 4) = variant.Value; *(ushort*) (address + 4) = variant.Value;
if (stain.HasValue) if (*(ushort*) address == 0)
*(address + 6) = 0;
else if (stain.HasValue)
*(address + 6) = (byte) stain.Value; *(address + 6) = (byte) stain.Value;
} }

BIN
Glamourer.zip
View file

Binary file not shown.

4
Glamourer/Designs/FixedDesigns.cs
View file

@ -129,9 +129,9 @@ namespace Glamourer.Designs
var applicableDesigns = designs.OrderBy(d => d.Jobs.Count).Where(d => d.Jobs.Fits(character.ClassJob.Id)); var applicableDesigns = designs.OrderBy(d => d.Jobs.Count).Where(d => d.Jobs.Fits(character.ClassJob.Id));
bool designApplied = false; var designApplied = false;
foreach (var design in applicableDesigns) { foreach (var design in applicableDesigns) {
PluginLog.Debug("Redrawing {CharacterName} with {DesignName} for job {JobGroup}.", name, design.Design.FullName(), PluginLog.Debug("Applying {DesignName} on {CharacterName} for job {JobGroup}.", design.Design.FullName(), name,
design.Jobs.Name); design.Jobs.Name);
design.Design.Data.Apply(character); design.Design.Data.Apply(character);
Glamourer.PlayerWatcher.UpdatePlayerWithoutEvent(character); Glamourer.PlayerWatcher.UpdatePlayerWithoutEvent(character);

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.1.1.3</FileVersion> <FileVersion>0.1.1.4</FileVersion>
<AssemblyVersion>0.1.1.3</AssemblyVersion> <AssemblyVersion>0.1.1.4</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.1.1.3", "AssemblyVersion": "0.1.1.4",
"RepoUrl": "https://github.com/Ottermandias/Glamourer", "RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 8, "DalamudApiLevel": 8,

2
Glamourer/Gui/Interface.cs
View file

@ -53,7 +53,7 @@ namespace Glamourer.Gui
var equip = GameData.ItemsBySlot(Dalamud.GameData); var equip = GameData.ItemsBySlot(Dalamud.GameData);
_combos = equip.ToDictionary(kvp => kvp.Key, kvp => CreateCombos(kvp.Key, kvp.Value, stainCombo)); _combos = equip.ToDictionary(kvp => kvp.Key, kvp => CreateCombos(kvp.Key, kvp.Value, stainCombo));
_globalStainCombo = new ComboWithFilter<Stain>("Dye All Slots", stainCombo); _globalStainCombo = new ComboWithFilter<Stain>("##GlobalStain", stainCombo);
_legacyTattooIcon = GetLegacyTattooIcon(); _legacyTattooIcon = GetLegacyTattooIcon();
} }

5
Glamourer/Gui/InterfaceEquipment.cs
View file

@ -1,5 +1,4 @@
using System.Linq; using System.Linq;
using Dalamud.Interface;
using ImGuiNET; using ImGuiNET;
using Lumina.Text; using Lumina.Text;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
@ -47,6 +46,8 @@ namespace Glamourer.Gui
stainCombo.PostPreview = null; stainCombo.PostPreview = null;
var change = stainCombo.Draw(string.Empty, out var newStain); var change = stainCombo.Draw(string.Empty, out var newStain);
ImGui.SameLine();
ImGui.TextUnformatted("Dye All Slots");
if (!change) if (!change)
{ {
ImGuiCustom.HoverTooltip("Right-click to clear."); ImGuiCustom.HoverTooltip("Right-click to clear.");
@ -64,6 +65,8 @@ namespace Glamourer.Gui
{ {
foreach (var key in GetEquipSlotNames().Keys) foreach (var key in GetEquipSlotNames().Keys)
{ {
if (key is EquipSlot.OffHand && _selection?.Data.Equipment.OffHand.Set.Value == 0)
continue;
_selection?.Data.WriteStain(key, newStain.RowIndex); _selection?.Data.WriteStain(key, newStain.RowIndex);
} }
return _inDesignMode; return _inDesignMode;

2
Glamourer/Gui/InterfaceFixedDesigns.cs
View file

@ -132,7 +132,7 @@ namespace Glamourer.Gui
raii.PopFonts(); raii.PopFonts();
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale); ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale);
ImGui.InputTextWithHint("##NewFix", "Enter new Character", ref _newFixCharacterName, 32); ImGui.InputTextWithHint("##NewFix", "Enter new Character", ref _newFixCharacterName, 64);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.SetNextItemWidth(-1); ImGui.SetNextItemWidth(-1);
if (raii.Begin(() => ImGui.BeginCombo("##NewFixDesignGroup", _newFixDesignGroup.Value.Name), ImGui.EndCombo)) if (raii.Begin(() => ImGui.BeginCombo("##NewFixDesignGroup", _newFixDesignGroup.Value.Name), ImGui.EndCombo))

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.", "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.1.1.3", "AssemblyVersion": "0.1.1.4",
"TestingAssemblyVersion": "0.1.1.3", "TestingAssemblyVersion": "0.1.1.4",
"RepoUrl": "https://github.com/Ottermandias/Glamourer", "RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 8, "DalamudApiLevel": 8,