ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-18 05:47:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rt-rework

Browse source
This commit is contained in:
Exter-N 2023-11-12 22:47:25 +01:00
commit 4e26f09109
8 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OtterGui

@ -1 +1 @@
Subproject commit 6f17ef70c41f3b31a401fdc9d6e37087e64f2035 Subproject commit b09bbcc276363bc994d90b641871e6280898b6e5

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 1f274b41e3e703712deb83f3abd8727e10614ebe Subproject commit 20e8002bfe701e54b05721c3b7b80c495a692adc

1
Penumbra/Configuration.cs
View file

@ -35,6 +35,7 @@ public class Configuration : IPluginConfiguration, ISavable
public string ModDirectory { get; set; } = string.Empty; public string ModDirectory { get; set; } = string.Empty;
public string ExportDirectory { get; set; } = string.Empty; public string ExportDirectory { get; set; } = string.Empty;
public bool OpenWindowAtStart { get; set; } = false;
public bool HideUiInGPose { get; set; } = false; public bool HideUiInGPose { get; set; } = false;
public bool HideUiInCutscenes { get; set; } = true; public bool HideUiInCutscenes { get; set; } = true;
public bool HideUiWhenUiHidden { get; set; } = false; public bool HideUiWhenUiHidden { get; set; } = false;

3
Penumbra/Services/StainService.cs
View file

@ -26,7 +26,8 @@ public class StainService : IDisposable
using var t = timer.Measure(StartTimeType.Stains); using var t = timer.Measure(StartTimeType.Stains);
StainData = new StainData(pluginInterface, dataManager, dataManager.Language, dalamudLog); StainData = new StainData(pluginInterface, dataManager, dataManager.Language, dalamudLog);
StainCombo = new FilterComboColors(140, StainCombo = new FilterComboColors(140,
StainData.Data.Prepend(new KeyValuePair<byte, (string Name, uint Dye, bool Gloss)>(0, ("None", 0, false))), Penumbra.Log); () => StainData.Data.Prepend(new KeyValuePair<byte, (string Name, uint Dye, bool Gloss)>(0, ("None", 0, false))).ToList(),
Penumbra.Log);
StmFile = new StmFile(dataManager); StmFile = new StmFile(dataManager);
TemplateCombo = new StainTemplateCombo(StmFile.Entries.Keys.Prepend((ushort)0)); TemplateCombo = new StainTemplateCombo(StmFile.Entries.Keys.Prepend((ushort)0));
Penumbra.Log.Verbose($"[{nameof(StainService)}] Created."); Penumbra.Log.Verbose($"[{nameof(StainService)}] Created.");

9
Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs
View file

@ -27,6 +27,7 @@ public partial class ModEditWindow
private const string GenderTooltip = "Gender"; private const string GenderTooltip = "Gender";
private const string ObjectTypeTooltip = "Object Type"; private const string ObjectTypeTooltip = "Object Type";
private const string SecondaryIdTooltip = "Secondary ID"; private const string SecondaryIdTooltip = "Secondary ID";
private const string PrimaryIDTooltip = "Primary ID";
private const string VariantIdTooltip = "Variant ID"; private const string VariantIdTooltip = "Variant ID";
private const string EstTypeTooltip = "EST Type"; private const string EstTypeTooltip = "EST Type";
private const string RacialTribeTooltip = "Racial Tribe"; private const string RacialTribeTooltip = "Racial Tribe";
@ -415,6 +416,8 @@ public partial class ModEditWindow
_new.Entry).Copy(GetDefault(metaFileManager, _new) _new.Entry).Copy(GetDefault(metaFileManager, _new)
?? new ImcEntry()); ?? new ImcEntry());
ImGuiUtil.HoverTooltip(VariantIdTooltip);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
if (_new.ObjectType is ObjectType.DemiHuman) if (_new.ObjectType is ObjectType.DemiHuman)
{ {
@ -431,7 +434,6 @@ public partial class ModEditWindow
ImGui.Dummy(new Vector2(70 * UiHelpers.Scale, 0)); ImGui.Dummy(new Vector2(70 * UiHelpers.Scale, 0));
} }
ImGuiUtil.HoverTooltip(VariantIdTooltip);
// Values // Values
using var disabled = ImRaii.Disabled(); using var disabled = ImRaii.Disabled();
@ -475,7 +477,7 @@ public partial class ModEditWindow
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + ImGui.GetStyle().FramePadding.X); ImGui.SetCursorPosX(ImGui.GetCursorPosX() + ImGui.GetStyle().FramePadding.X);
ImGui.TextUnformatted(meta.PrimaryId.ToString()); ImGui.TextUnformatted(meta.PrimaryId.ToString());
ImGuiUtil.HoverTooltip("Primary ID"); ImGuiUtil.HoverTooltip(PrimaryIDTooltip);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + ImGui.GetStyle().FramePadding.X); ImGui.SetCursorPosX(ImGui.GetCursorPosX() + ImGui.GetStyle().FramePadding.X);
@ -498,7 +500,10 @@ public partial class ModEditWindow
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + ImGui.GetStyle().FramePadding.X); ImGui.SetCursorPosX(ImGui.GetCursorPosX() + ImGui.GetStyle().FramePadding.X);
if (meta.ObjectType is ObjectType.DemiHuman) if (meta.ObjectType is ObjectType.DemiHuman)
{
ImGui.TextUnformatted(meta.EquipSlot.ToName()); ImGui.TextUnformatted(meta.EquipSlot.ToName());
ImGuiUtil.HoverTooltip(EquipSlotTooltip);
}
// Values // Values
using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing,

2
Penumbra/UI/ConfigWindow.cs
View file

@ -32,7 +32,7 @@ public sealed class ConfigWindow : Window
RespectCloseHotkey = true; RespectCloseHotkey = true;
tutorial.UpdateTutorialStep(); tutorial.UpdateTutorialStep();
IsOpen = _config.DebugMode; IsOpen = _config.OpenWindowAtStart;
} }
public void Setup(Penumbra penumbra, ConfigTabBar configTabs) public void Setup(Penumbra penumbra, ConfigTabBar configTabs)

9
Penumbra/UI/Tabs/SettingsTab.cs
View file

@ -345,22 +345,25 @@ public class SettingsTab : ITab
/// <summary> Draw the window hiding state checkboxes. </summary> /// <summary> Draw the window hiding state checkboxes. </summary>
private void DrawHidingSettings() private void DrawHidingSettings()
{ {
Checkbox("Open Config Window at Game Start", "Whether the Penumbra main window should be open or closed after launching the game.",
_config.OpenWindowAtStart, v => _config.OpenWindowAtStart = v);
Checkbox("Hide Config Window when UI is Hidden", Checkbox("Hide Config Window when UI is Hidden",
"Hide the penumbra main window when you manually hide the in-game user interface.", _config.HideUiWhenUiHidden, "Hide the Penumbra main window when you manually hide the in-game user interface.", _config.HideUiWhenUiHidden,
v => v =>
{ {
_config.HideUiWhenUiHidden = v; _config.HideUiWhenUiHidden = v;
_dalamud.UiBuilder.DisableUserUiHide = !v; _dalamud.UiBuilder.DisableUserUiHide = !v;
}); });
Checkbox("Hide Config Window when in Cutscenes", Checkbox("Hide Config Window when in Cutscenes",
"Hide the penumbra main window when you are currently watching a cutscene.", _config.HideUiInCutscenes, "Hide the Penumbra main window when you are currently watching a cutscene.", _config.HideUiInCutscenes,
v => v =>
{ {
_config.HideUiInCutscenes = v; _config.HideUiInCutscenes = v;
_dalamud.UiBuilder.DisableCutsceneUiHide = !v; _dalamud.UiBuilder.DisableCutsceneUiHide = !v;
}); });
Checkbox("Hide Config Window when in GPose", Checkbox("Hide Config Window when in GPose",
"Hide the penumbra main window when you are currently in GPose mode.", _config.HideUiInGPose, "Hide the Penumbra main window when you are currently in GPose mode.", _config.HideUiInGPose,
v => v =>
{ {
_config.HideUiInGPose = v; _config.HideUiInGPose = v;

10
repo.json
View file

@ -4,8 +4,8 @@
"Name": "Penumbra", "Name": "Penumbra",
"Description": "Runtime mod loader and manager.", "Description": "Runtime mod loader and manager.",
"InternalName": "Penumbra", "InternalName": "Penumbra",
"AssemblyVersion": "0.8.1.7", "AssemblyVersion": "0.8.1.8",
"TestingAssemblyVersion": "0.8.1.7", "TestingAssemblyVersion": "0.8.1.8",
"RepoUrl": "https://github.com/xivdev/Penumbra", "RepoUrl": "https://github.com/xivdev/Penumbra",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 9, "DalamudApiLevel": 9,
@ -16,9 +16,9 @@
"LoadPriority": 69420, "LoadPriority": 69420,
"LoadRequiredState": 2, "LoadRequiredState": 2,
"LoadSync": true, "LoadSync": true,
"DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/0.8.1.7/Penumbra.zip", "DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/0.8.1.8/Penumbra.zip",
"DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/0.8.1.7/Penumbra.zip", "DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/0.8.1.8/Penumbra.zip",
"DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/0.8.1.7/Penumbra.zip", "DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/0.8.1.8/Penumbra.zip",
"IconUrl": "https://raw.githubusercontent.com/xivdev/Penumbra/master/images/icon.png" "IconUrl": "https://raw.githubusercontent.com/xivdev/Penumbra/master/images/icon.png"
} }
] ]