ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-31 21:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

build: v5.2.3.7

Browse source
This commit is contained in:
goat 2021-04-01 21:37:59 +02:00
parent bb002203f9
commit 886ebf4a31
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud.Injector/Dalamud.Injector.csproj
View file

@ -14,10 +14,10 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Feature"> <PropertyGroup Label="Feature">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyVersion>5.2.3.6</AssemblyVersion> <AssemblyVersion>5.2.3.7</AssemblyVersion>
<FileVersion>5.2.3.6</FileVersion> <FileVersion>5.2.3.7</FileVersion>
<Description>XIVLauncher addon injection</Description> <Description>XIVLauncher addon injection</Description>
<Version>5.2.3.6</Version> <Version>5.2.3.7</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>

6
Dalamud/Dalamud.csproj
View file

@ -15,9 +15,9 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Feature"> <PropertyGroup Label="Feature">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyVersion>5.2.3.6</AssemblyVersion> <AssemblyVersion>5.2.3.7</AssemblyVersion>
<Version>5.2.3.6</Version> <Version>5.2.3.7</Version>
<FileVersion>5.2.3.6</FileVersion> <FileVersion>5.2.3.7</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Resources"> <ItemGroup Label="Resources">
<None Include="$(SolutionDir)/Resources/**/*" CopyToOutputDirectory="PreserveNewest" Visible="false" /> <None Include="$(SolutionDir)/Resources/**/*" CopyToOutputDirectory="PreserveNewest" Visible="false" />

13
Dalamud/Fools2021.cs
View file

@ -111,6 +111,7 @@ namespace Dalamud
ImGui.Begin("Tippy AI debug"); ImGui.Begin("Tippy AI debug");
ImGui.Text("State: " + this.tippyState); ImGui.Text("State: " + this.tippyState);
ImGui.Text("Logic: " + this.tippyLogicTimer.ElapsedMilliseconds);
foreach (var tippyAnimData in this.tippyAnimDatas) foreach (var tippyAnimData in this.tippyAnimDatas)
{ {
@ -135,7 +136,7 @@ namespace Dalamud
if (ImGui.Button("SetNewTip")) if (ImGui.Button("SetNewTip"))
SetNewTip(); SetNewTip();
foreach (var lastGeneralTip in this.lastGeneralTips) { foreach (var lastGeneralTip in this.lastTips) {
ImGui.Text(lastGeneralTip); ImGui.Text(lastGeneralTip);
} }
@ -344,7 +345,7 @@ namespace Dalamud
switch (tippyState) { switch (tippyState) {
case TippyState.Tips: case TippyState.Tips:
if (this.tippyLogicTimer.ElapsedMilliseconds > 600000 && string.IsNullOrEmpty(this.tippyText)) // New tip every 10 minutes if (this.tippyLogicTimer.ElapsedMilliseconds > 900000 && string.IsNullOrEmpty(this.tippyText)) // New tip every 15 minutes
SetNewTip(); SetNewTip();
break; break;
case TippyState.Timeout: case TippyState.Timeout:
@ -372,7 +373,9 @@ namespace Dalamud
ImGui.PushFont(InterfaceManager.FoolsFont); ImGui.PushFont(InterfaceManager.FoolsFont);
if (!string.IsNullOrEmpty(this.tippyText) && !ShouldHide) var shouldDraw = this.tippyAnim != TippyAnimState.Idle;
if (!string.IsNullOrEmpty(this.tippyText) && !ShouldHide && shouldDraw)
{ {
DrawTextBox(this.tippyText); DrawTextBox(this.tippyText);
} }
@ -382,7 +385,7 @@ namespace Dalamud
ImGui.SetCursorPosX(230); ImGui.SetCursorPosX(230);
ImGui.SetCursorPosY(18 + 55); ImGui.SetCursorPosY(18 + 55);
if (!ShouldHide) if (!ShouldHide && shouldDraw)
DrawTippyAnim(); DrawTippyAnim();
ImGui.End(); ImGui.End();
@ -391,7 +394,7 @@ namespace Dalamud
ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 0, 0, 1)); ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 0, 0, 1));
if (this.showTippyButton && !ShouldHide) { if (this.showTippyButton && !ShouldHide && shouldDraw) {
ImGui.SetNextWindowPos(tippyPos + new Vector2(117, 117), ImGuiCond.Always); ImGui.SetNextWindowPos(tippyPos + new Vector2(117, 117), ImGuiCond.Always);
ImGui.SetNextWindowSize(new Vector2(95, 40), ImGuiCond.Always); ImGui.SetNextWindowSize(new Vector2(95, 40), ImGuiCond.Always);
//ImGui.SetNextWindowFocus(); //ImGui.SetNextWindowFocus();