Skip to content

Commit

Permalink
Added KamiLib
Browse files Browse the repository at this point in the history
  • Loading branch information
Felscream committed Sep 6, 2024
1 parent 4197766 commit 71155b0
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 77 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "KamiLib"]
path = KamiLib
url = https://github.com/jkchen2/KamiLib
branch = berna-downstream
10 changes: 10 additions & 0 deletions DragoonMayCry.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ VisualStudioVersion = 17.9.34728.123
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragoonMayCry", "DragoonMayCry\DragoonMayCry.csproj", "{13C812E9-0D42-4B95-8646-40EEBF30636F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KamiLib", "KamiLib\KamiLib.csproj", "{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -21,6 +23,14 @@ Global
{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|Any CPU.Build.0 = Release|x64
{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.ActiveCfg = Release|x64
{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.Build.0 = Release|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Debug|Any CPU.ActiveCfg = Debug|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Debug|Any CPU.Build.0 = Debug|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Debug|x64.ActiveCfg = Debug|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Debug|x64.Build.0 = Debug|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Release|Any CPU.ActiveCfg = Release|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Release|Any CPU.Build.0 = Release|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Release|x64.ActiveCfg = Release|x64
{05370DB9-460B-4BF3-BD01-ABF02C8DD0AD}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
64 changes: 0 additions & 64 deletions DragoonMayCry/Cache/LuminaCache.cs

This file was deleted.

4 changes: 4 additions & 0 deletions DragoonMayCry/DragoonMayCry.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,8 @@
<Private>false</Private>
</Reference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\KamiLib\KamiLib.csproj" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions DragoonMayCry/Score/Action/PlayerActionTracker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Hooking;
using Dalamud.Plugin.Services;
using DragoonMayCry.Cache;
using DragoonMayCry.State;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using ImGuiNET;
using KamiLib.Caching;
using System;
using System.Collections.Generic;
using System.Diagnostics;
Expand Down
10 changes: 2 additions & 8 deletions DragoonMayCry/Score/ItemLevelCalculator.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DragoonMayCry.Cache;
using DragoonMayCry.Data;
using DragoonMayCry.State;
using DragoonMayCry.Util;
using FFXIVClientStructs.FFXIV.Client.Game;
using KamiLib.Caching;
using Lumina.Excel.GeneratedSheets;
using System;

namespace DragoonMayCry.Score
{
Expand Down
2 changes: 1 addition & 1 deletion DragoonMayCry/State/PlayerState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public bool IsIncapacitated()
{
continue;
}
if (DebuffIds.IsIncapacitatingDebuff(status.GameData.RowId))
if (DebuffIds.IsIncapacitatingDebuff(status.StatusId))
{
return true;
}
Expand Down
2 changes: 0 additions & 2 deletions DragoonMayCry/State/Tracker/DebuffTracker.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Dalamud.Game.ClientState.Statuses;
using DragoonMayCry.Cache;
using DragoonMayCry.Data;
using System.Collections.Generic;
using LuminaStatus = Lumina.Excel.GeneratedSheets.Status;
namespace DragoonMayCry.State.Tracker
{
internal class DebuffTracker : StateTracker<bool>
Expand Down
3 changes: 3 additions & 0 deletions DragoonMayCry/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
"type": "Transitive",
"resolved": "2.2.1",
"contentHash": "GgkdP6K/7FqXFo7uHvoqGZTJvW4z8g2IffhOO4JHaLzKCdDOUEzVKtveoZkCuUX8eV2HAINqi7VFqlFndrnz/g=="
},
"kamilib": {
"type": "Project"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions KamiLib
Submodule KamiLib added at aa30b5

0 comments on commit 71155b0

Please sign in to comment.