Skip to content

Commit

Permalink
vsc stuff fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xanunderscore committed Feb 1, 2025
1 parent 643c70e commit a1d207e
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 28 deletions.
35 changes: 14 additions & 21 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
{
"version": "0.2.0",
"configurations": [
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/UIDev/bin/Debug/net8.0-windows/UIDev.dll",
"args": [],
"cwd": "${workspaceFolder}/UIDev/bin/Debug/net8.0-windows",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false
}
]
}
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "C#: UIDev Debug",
"type": "dotnet",
"request": "launch",
"projectPath": "${workspaceFolder}/UIDev/UIDev.csproj"
}
]
}
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"/consoleloggerparameters:NoSummary;ForceNoAlign",
"--configuration",
"Release",
"--output",
"${workspaceFolder}/BossMod/bin/x64/Release/"
"-p",
"Platform=x64"
],
"problemMatcher": "$msCompile",
"group": {
Expand Down
6 changes: 5 additions & 1 deletion BossMod/Autorotation/Standard/xan/Casters/PCT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,11 @@ private bool ShouldPaintInOpener(StrategyValues strategy)
if (strategy.Option(Track.Motif).As<MotifStrategy>() != MotifStrategy.Combat)
return false;

return !WingFangMuse && BestPortrait == AID.None && (CreatureFlags.HasFlag(CreatureFlags.Pom) || CreatureFlags.HasFlag(CreatureFlags.Claw)) && CanWeave(AID.LivingMuse, 0, extraFixedDelay: 4) && CanWeave(AID.MogOfTheAges, 5);
return !CreaturePainted
&& BestPortrait == AID.None
&& (CreatureFlags.HasFlag(CreatureFlags.Pom) || CreatureFlags.HasFlag(CreatureFlags.Claw))
&& CanWeave(AID.LivingMuse, 0, extraFixedDelay: 4)
&& CanWeave(AID.MogOfTheAges, 5);
}

protected override float GetCastTime(AID aid) => aid switch
Expand Down
4 changes: 2 additions & 2 deletions BossMod/BossMod.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<ReportAnalyzer>true</ReportAnalyzer>
</PropertyGroup>

Expand Down Expand Up @@ -50,7 +50,7 @@
<PackageReference Include="DalamudPackager" Version="11.0.0" />
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
<PackageReference Include="System.Data.Sqlite" Version="1.0.119" />
<ProjectReference Include="..\CodeAnalysis\CodeAnalysis.csproj">
<ProjectReference Include="..\CodeAnalysis\CodeAnalysis.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Analyzer</OutputItemType>
</ProjectReference>
Expand Down
4 changes: 2 additions & 2 deletions UIDev/UIDev.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<Platforms>x64</Platforms>
<Platforms>AnyCPU</Platforms>
<Nullable>enable</Nullable>
<OutputType>WinExe</OutputType>
<LangVersion>preview</LangVersion>
Expand Down Expand Up @@ -69,6 +69,6 @@
</ItemGroup>

<Target Name="PostBuildScript" AfterTargets="Build">
<Copy SourceFiles="$(DalamudLibPath)cimgui.dll" DestinationFolder="$(OutputPath)"/>
<Copy SourceFiles="$(DalamudLibPath)cimgui.dll" DestinationFolder="$(OutputPath)" />
</Target>
</Project>

0 comments on commit a1d207e

Please sign in to comment.