Split point calculation by phase; API 8
This commit is contained in:
parent
15eceacab4
commit
5b1eef26f0
GPG Key ID:
7199F8D727D55F67
@ -1,9 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net5.0-windows7.0</TargetFramework>
|
<TargetFramework>net7.0-windows</TargetFramework>
|
||||||
<LangVersion>9.0</LangVersion>
|
<LangVersion>9.0</LangVersion>
|
||||||
<Version>1.0.0.0</Version>
|
<Version>1.0.0.0</Version>
|
||||||
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
@ -13,46 +14,37 @@
|
|||||||
<RootNamespace>DiademCalculator</RootNamespace>
|
<RootNamespace>DiademCalculator</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
|
||||||
<OutputPath>C:\Users\User\AppData\Roaming\XIVLauncher\devPlugins\</OutputPath>
|
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DalamudPackager" Version="2.1.2" />
|
<PackageReference Include="DalamudPackager" Version="2.1.10" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Dalamud">
|
<Reference Include="Dalamud">
|
||||||
<HintPath>C:\Users\User\AppData\Roaming\XIVLauncher\addon\Hooks\6.3.0.6\Dalamud.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
|
||||||
<Private>false</Private>
|
<Private>false</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FFXIVClientStructs">
|
<Reference Include="FFXIVClientStructs">
|
||||||
<HintPath>C:\Users\User\AppData\Roaming\XIVLauncher\addon\Hooks\6.3.0.6\FFXIVClientStructs.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
|
||||||
<Private>false</Private>
|
<Private>false</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="ImGui.NET">
|
<Reference Include="ImGui.NET">
|
||||||
<HintPath>C:\Users\User\AppData\Roaming\XIVLauncher\addon\Hooks\6.3.0.6\ImGui.NET.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
|
||||||
<Private>false</Private>
|
<Private>false</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="ImGuiScene">
|
<Reference Include="ImGuiScene">
|
||||||
<HintPath>C:\Users\User\AppData\Roaming\XIVLauncher\addon\Hooks\6.3.0.6\ImGuiScene.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll</HintPath>
|
||||||
<Private>false</Private>
|
<Private>false</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Lumina">
|
<Reference Include="Lumina">
|
||||||
<HintPath>C:\Users\User\AppData\Roaming\XIVLauncher\addon\Hooks\6.3.0.6\Lumina.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
|
||||||
<Private>false</Private>
|
<Private>false</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Lumina.Excel">
|
<Reference Include="Lumina.Excel">
|
||||||
<HintPath>C:\Users\User\AppData\Roaming\XIVLauncher\addon\Hooks\6.3.0.6\Lumina.Excel.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
|
||||||
<Private>false</Private>
|
<Private>false</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Newtonsoft.Json">
|
<Reference Include="Newtonsoft.Json">
|
||||||
<HintPath>C:\Users\User\AppData\Roaming\XIVLauncher\addon\Hooks\6.3.0.6\Newtonsoft.Json.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
|
||||||
<Private>false</Private>
|
<Private>false</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@ -12,13 +12,15 @@ namespace DiademCalculator
|
|||||||
public readonly int Set;
|
public readonly int Set;
|
||||||
public readonly int ScripsReward;
|
public readonly int ScripsReward;
|
||||||
public readonly int PointsReward;
|
public readonly int PointsReward;
|
||||||
|
public readonly int Phase;
|
||||||
|
|
||||||
public DiademResourceInfo(uint id, int set, int scripsReward, int pointsReward)
|
public DiademResourceInfo(uint id, int set, int scripsReward, int pointsReward, int phase)
|
||||||
{
|
{
|
||||||
Id = id;
|
Id = id;
|
||||||
Set = set;
|
Set = set;
|
||||||
ScripsReward = scripsReward;
|
ScripsReward = scripsReward;
|
||||||
PointsReward = pointsReward;
|
PointsReward = pointsReward;
|
||||||
|
Phase = phase;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
301
Source/Plugin.cs
301
Source/Plugin.cs
@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Numerics;
|
using System.Numerics;
|
||||||
using Dalamud.Data;
|
using Dalamud.Data;
|
||||||
using Dalamud.Game;
|
using Dalamud.Game;
|
||||||
@ -24,135 +25,135 @@ namespace DiademCalculator
|
|||||||
{
|
{
|
||||||
static readonly List<DiademResourceInfo> _minerPreset = new List<DiademResourceInfo>()
|
static readonly List<DiademResourceInfo> _minerPreset = new List<DiademResourceInfo>()
|
||||||
{
|
{
|
||||||
new DiademResourceInfo(29939, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Cloudstone
|
new DiademResourceInfo(29939, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Cloudstone
|
||||||
new DiademResourceInfo(29940, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Rock Salt
|
new DiademResourceInfo(29940, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Rock Salt
|
||||||
new DiademResourceInfo(29941, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Spring Water
|
new DiademResourceInfo(29941, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Spring Water
|
||||||
new DiademResourceInfo(29942, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Aurum Regis Sand
|
new DiademResourceInfo(29942, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Aurum Regis Sand
|
||||||
new DiademResourceInfo(29943, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Jade
|
new DiademResourceInfo(29943, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Jade
|
||||||
new DiademResourceInfo(29946, 10, 0, 4), //Grade 2 Skybuilders' Umbral Flarestone
|
new DiademResourceInfo(29946, 10, 0, 4, 2), //Grade 2 Skybuilders' Umbral Flarestone
|
||||||
new DiademResourceInfo(29947, 10, 0, 4), //Grade 2 Skybuilders' Umbral Levinshard
|
new DiademResourceInfo(29947, 10, 0, 4, 2), //Grade 2 Skybuilders' Umbral Levinshard
|
||||||
|
|
||||||
new DiademResourceInfo(31311, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Cloudstone
|
new DiademResourceInfo(31311, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Cloudstone
|
||||||
new DiademResourceInfo(31312, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Basilisk Egg
|
new DiademResourceInfo(31312, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Basilisk Egg
|
||||||
new DiademResourceInfo(31313, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Alumen
|
new DiademResourceInfo(31313, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Alumen
|
||||||
new DiademResourceInfo(31314, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Clay
|
new DiademResourceInfo(31314, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Clay
|
||||||
new DiademResourceInfo(31315, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Granite
|
new DiademResourceInfo(31315, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Granite
|
||||||
new DiademResourceInfo(31318, 5, 0, 2), //Grade 3 Skybuilders' Umbral Magma Shard
|
new DiademResourceInfo(31318, 5, 0, 2, 3), //Grade 3 Skybuilders' Umbral Magma Shard
|
||||||
new DiademResourceInfo(31319, 5, 0, 2), //Grade 3 Skybuilders' Umbral Levinite
|
new DiademResourceInfo(31319, 5, 0, 2, 3), //Grade 3 Skybuilders' Umbral Levinite
|
||||||
|
|
||||||
new DiademResourceInfo(32007, 5, 1, 0), //Grade 4 Skybuilders' Iron Ore
|
new DiademResourceInfo(32007, 5, 1, 0, -1), //Grade 4 Skybuilders' Iron Ore
|
||||||
new DiademResourceInfo(32008, 5, 1, 0), //Grade 4 Skybuilders' Iron Sand
|
new DiademResourceInfo(32008, 5, 1, 0, -1), //Grade 4 Skybuilders' Iron Sand
|
||||||
new DiademResourceInfo(32012, 5, 1, 0), //Grade 4 Skybuilders' Ore
|
new DiademResourceInfo(32012, 5, 1, 0, -1), //Grade 4 Skybuilders' Ore
|
||||||
new DiademResourceInfo(32013, 5, 1, 0), //Grade 4 Skybuilders' Rock Salt
|
new DiademResourceInfo(32013, 5, 1, 0, -1), //Grade 4 Skybuilders' Rock Salt
|
||||||
new DiademResourceInfo(32014, 5, 1, 0), //Grade 4 Skybuilders' Mythrite Sand
|
new DiademResourceInfo(32014, 5, 1, 0, -1), //Grade 4 Skybuilders' Mythrite Sand
|
||||||
new DiademResourceInfo(32020, 5, 2, 0), //Grade 4 Skybuilders' Electrum Ore
|
new DiademResourceInfo(32020, 5, 2, 0, -1), //Grade 4 Skybuilders' Electrum Ore
|
||||||
new DiademResourceInfo(32021, 5, 2, 0), //Grade 4 Skybuilders' Alumen
|
new DiademResourceInfo(32021, 5, 2, 0, -1), //Grade 4 Skybuilders' Alumen
|
||||||
new DiademResourceInfo(32022, 5, 2, 0), //Grade 4 Skybuilders' Spring Water
|
new DiademResourceInfo(32022, 5, 2, 0, -1), //Grade 4 Skybuilders' Spring Water
|
||||||
new DiademResourceInfo(32023, 5, 2, 0), //Grade 4 Skybuilders' Gold Sand
|
new DiademResourceInfo(32023, 5, 2, 0, -1), //Grade 4 Skybuilders' Gold Sand
|
||||||
new DiademResourceInfo(32024, 5, 2, 0), //Grade 4 Skybuilders' Ragstone
|
new DiademResourceInfo(32024, 5, 2, 0, -1), //Grade 4 Skybuilders' Ragstone
|
||||||
new DiademResourceInfo(32030, 5, 3, 13), //Grade 4 Skybuilders' Gold Ore
|
new DiademResourceInfo(32030, 5, 3, 13, -1), //Grade 4 Skybuilders' Gold Ore
|
||||||
new DiademResourceInfo(32031, 5, 3, 13), //Grade 4 Skybuilders' Finest Rock Salt
|
new DiademResourceInfo(32031, 5, 3, 13, -1), //Grade 4 Skybuilders' Finest Rock Salt
|
||||||
new DiademResourceInfo(32032, 5, 3, 13), //Grade 4 Skybuilders' Truespring Water
|
new DiademResourceInfo(32032, 5, 3, 13, -1), //Grade 4 Skybuilders' Truespring Water
|
||||||
new DiademResourceInfo(32033, 5, 3, 13), //Grade 4 Skybuilders' Mineral Sand
|
new DiademResourceInfo(32033, 5, 3, 13, -1), //Grade 4 Skybuilders' Mineral Sand
|
||||||
new DiademResourceInfo(32034, 5, 3, 13), //Grade 4 Skybuilders' Bluespirit Ore
|
new DiademResourceInfo(32034, 5, 3, 13, -1), //Grade 4 Skybuilders' Bluespirit Ore
|
||||||
new DiademResourceInfo(32040, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Cloudstone
|
new DiademResourceInfo(32040, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Cloudstone
|
||||||
new DiademResourceInfo(32041, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Spring Water
|
new DiademResourceInfo(32041, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Spring Water
|
||||||
new DiademResourceInfo(32042, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Ice Stalagmite
|
new DiademResourceInfo(32042, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Ice Stalagmite
|
||||||
new DiademResourceInfo(32043, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Silex
|
new DiademResourceInfo(32043, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Silex
|
||||||
new DiademResourceInfo(32044, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Prismstone
|
new DiademResourceInfo(32044, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Prismstone
|
||||||
new DiademResourceInfo(32047, 5, 5, 15), //Grade 4 Skybuilders' Umbral Flarerock
|
new DiademResourceInfo(32047, 5, 5, 15, 4), //Grade 4 Skybuilders' Umbral Flarerock
|
||||||
new DiademResourceInfo(32048, 5, 5, 15), //Grade 4 Skybuilders' Umbral Levinsand
|
new DiademResourceInfo(32048, 5, 5, 15, 4), //Grade 4 Skybuilders' Umbral Levinsand
|
||||||
};
|
};
|
||||||
|
|
||||||
static readonly List<DiademResourceInfo> _botanistPreset = new List<DiademResourceInfo>()
|
static readonly List<DiademResourceInfo> _botanistPreset = new List<DiademResourceInfo>()
|
||||||
{
|
{
|
||||||
new DiademResourceInfo(29934, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Log
|
new DiademResourceInfo(29934, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Log
|
||||||
new DiademResourceInfo(29935, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Hardened Sap
|
new DiademResourceInfo(29935, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Hardened Sap
|
||||||
new DiademResourceInfo(29936, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Wheat
|
new DiademResourceInfo(29936, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Wheat
|
||||||
new DiademResourceInfo(29937, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Cotton Boll
|
new DiademResourceInfo(29937, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Cotton Boll
|
||||||
new DiademResourceInfo(29938, 10, 0, 3), //Grade 2 Artisanal Skybuilders' Dawn Lizard
|
new DiademResourceInfo(29938, 10, 0, 3, 2), //Grade 2 Artisanal Skybuilders' Dawn Lizard
|
||||||
new DiademResourceInfo(29944, 10, 0, 4), //Grade 2 Skybuilders' Umbral Galewood Log
|
new DiademResourceInfo(29944, 10, 0, 4, 2), //Grade 2 Skybuilders' Umbral Galewood Log
|
||||||
new DiademResourceInfo(29945, 10, 0, 4), //Grade 2 Skybuilders' Umbral Earthcap
|
new DiademResourceInfo(29945, 10, 0, 4, 2), //Grade 2 Skybuilders' Umbral Earthcap
|
||||||
|
|
||||||
new DiademResourceInfo(31306, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Log
|
new DiademResourceInfo(31306, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Log
|
||||||
new DiademResourceInfo(31307, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Amber
|
new DiademResourceInfo(31307, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Amber
|
||||||
new DiademResourceInfo(31308, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Cotton Boll
|
new DiademResourceInfo(31308, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Cotton Boll
|
||||||
new DiademResourceInfo(31309, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Rice
|
new DiademResourceInfo(31309, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Rice
|
||||||
new DiademResourceInfo(31310, 5, 0, 2), //Grade 3 Artisanal Skybuilders' Vine
|
new DiademResourceInfo(31310, 5, 0, 2, 3), //Grade 3 Artisanal Skybuilders' Vine
|
||||||
new DiademResourceInfo(31316, 5, 0, 2), //Grade 3 Skybuilders' Umbral Galewood Sap
|
new DiademResourceInfo(31316, 5, 0, 2, 3), //Grade 3 Skybuilders' Umbral Galewood Sap
|
||||||
new DiademResourceInfo(31317, 5, 0, 2), //Grade 3 Skybuilders' Umbral Tortoise
|
new DiademResourceInfo(31317, 5, 0, 2, 3), //Grade 3 Skybuilders' Umbral Tortoise
|
||||||
|
|
||||||
new DiademResourceInfo(32005, 5, 1, 0), //Grade 4 Skybuilders' Switch
|
new DiademResourceInfo(32005, 5, 1, 0, -1), //Grade 4 Skybuilders' Switch
|
||||||
new DiademResourceInfo(32006, 5, 1, 0), //Grade 4 Skybuilders' Hemp
|
new DiademResourceInfo(32006, 5, 1, 0, -1), //Grade 4 Skybuilders' Hemp
|
||||||
new DiademResourceInfo(32009, 5, 1, 0), //Grade 4 Skybuilders' Mahogany Log
|
new DiademResourceInfo(32009, 5, 1, 0, -1), //Grade 4 Skybuilders' Mahogany Log
|
||||||
new DiademResourceInfo(32010, 5, 1, 0), //Grade 4 Skybuilders' Sesame
|
new DiademResourceInfo(32010, 5, 1, 0, -1), //Grade 4 Skybuilders' Sesame
|
||||||
new DiademResourceInfo(32011, 5, 1, 0), //Grade 4 Skybuilders' Cotton Boll
|
new DiademResourceInfo(32011, 5, 1, 0, -1), //Grade 4 Skybuilders' Cotton Boll
|
||||||
new DiademResourceInfo(32015, 5, 2, 0), //Grade 4 Skybuilders' Spruce Log
|
new DiademResourceInfo(32015, 5, 2, 0, -1), //Grade 4 Skybuilders' Spruce Log
|
||||||
new DiademResourceInfo(32016, 5, 2, 0), //Grade 4 Skybuilders' Mistletoe
|
new DiademResourceInfo(32016, 5, 2, 0, -1), //Grade 4 Skybuilders' Mistletoe
|
||||||
new DiademResourceInfo(32017, 5, 2, 0), //Grade 4 Skybuilders' Toad
|
new DiademResourceInfo(32017, 5, 2, 0, -1), //Grade 4 Skybuilders' Toad
|
||||||
new DiademResourceInfo(32018, 5, 2, 0), //Grade 4 Skybuilders' Vine
|
new DiademResourceInfo(32018, 5, 2, 0, -1), //Grade 4 Skybuilders' Vine
|
||||||
new DiademResourceInfo(32019, 5, 2, 0), //Grade 4 Skybuilders' Tea Leaves
|
new DiademResourceInfo(32019, 5, 2, 0, -1), //Grade 4 Skybuilders' Tea Leaves
|
||||||
new DiademResourceInfo(32025, 5, 3, 13), //Grade 4 Skybuilders' White Cedar Log
|
new DiademResourceInfo(32025, 5, 3, 13, -1), //Grade 4 Skybuilders' White Cedar Log
|
||||||
new DiademResourceInfo(32026, 5, 3, 13), //Grade 4 Skybuilders' Primordial Resin
|
new DiademResourceInfo(32026, 5, 3, 13, -1), //Grade 4 Skybuilders' Primordial Resin
|
||||||
new DiademResourceInfo(32027, 5, 3, 13), //Grade 4 Skybuilders' Wheat
|
new DiademResourceInfo(32027, 5, 3, 13, -1), //Grade 4 Skybuilders' Wheat
|
||||||
new DiademResourceInfo(32028, 5, 3, 13), //Grade 4 Skybuilders' Gossamer Cotton Boll
|
new DiademResourceInfo(32028, 5, 3, 13, -1), //Grade 4 Skybuilders' Gossamer Cotton Boll
|
||||||
new DiademResourceInfo(32029, 5, 3, 13), //Grade 4 Skybuilders' Tortoise
|
new DiademResourceInfo(32029, 5, 3, 13, -1), //Grade 4 Skybuilders' Tortoise
|
||||||
new DiademResourceInfo(32035, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Log
|
new DiademResourceInfo(32035, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Log
|
||||||
new DiademResourceInfo(32036, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Raspberry
|
new DiademResourceInfo(32036, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Raspberry
|
||||||
new DiademResourceInfo(32037, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Caiman
|
new DiademResourceInfo(32037, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Caiman
|
||||||
new DiademResourceInfo(32038, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Cocoon
|
new DiademResourceInfo(32038, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Cocoon
|
||||||
new DiademResourceInfo(32039, 5, 3, 13), //Grade 4 Artisanal Skybuilders' Barbgrass
|
new DiademResourceInfo(32039, 5, 3, 13, 4), //Grade 4 Artisanal Skybuilders' Barbgrass
|
||||||
new DiademResourceInfo(32045, 5, 5, 15), //Grade 4 Skybuilders' Umbral Galewood Branch
|
new DiademResourceInfo(32045, 5, 5, 15, 4), //Grade 4 Skybuilders' Umbral Galewood Branch
|
||||||
new DiademResourceInfo(32046, 5, 5, 15), //Grade 4 Skybuilders' Umbral Dirtleaf
|
new DiademResourceInfo(32046, 5, 5, 15, 4), //Grade 4 Skybuilders' Umbral Dirtleaf
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static readonly List<DiademResourceInfo> _fisherPreset = new List<DiademResourceInfo>()
|
static readonly List<DiademResourceInfo> _fisherPreset = new List<DiademResourceInfo>()
|
||||||
{
|
{
|
||||||
new DiademResourceInfo(30008, 1, 0, 15), //Grade 2 Artisanal Skybuilders' Pterodactyl
|
new DiademResourceInfo(30008, 1, 0, 15, 2), //Grade 2 Artisanal Skybuilders' Pterodactyl
|
||||||
new DiademResourceInfo(30009, 1, 0, 15), //Grade 2 Artisanal Skybuilders' Skyfish
|
new DiademResourceInfo(30009, 1, 0, 15, 2), //Grade 2 Artisanal Skybuilders' Skyfish
|
||||||
new DiademResourceInfo(30006, 1, 0, 158), //Grade 2 Artisanal Skybuilders' Rhomaleosaurus
|
new DiademResourceInfo(30006, 1, 0, 158, 2), //Grade 2 Artisanal Skybuilders' Rhomaleosaurus
|
||||||
new DiademResourceInfo(30007, 1, 0, 158), //Grade 2 Artisanal Skybuilders' Gobbie Mask
|
new DiademResourceInfo(30007, 1, 0, 158, 2), //Grade 2 Artisanal Skybuilders' Gobbie Mask
|
||||||
new DiademResourceInfo(30010, 1, 0, 15), //Grade 2 Artisanal Skybuilders' Cometfish
|
new DiademResourceInfo(30010, 1, 0, 15, 2), //Grade 2 Artisanal Skybuilders' Cometfish
|
||||||
new DiademResourceInfo(30011, 1, 0, 15), //Grade 2 Artisanal Skybuilders' Anomalocaris
|
new DiademResourceInfo(30011, 1, 0, 15, 2), //Grade 2 Artisanal Skybuilders' Anomalocaris
|
||||||
new DiademResourceInfo(30012, 1, 0, 15), //Grade 2 Artisanal Skybuilders' Rhamphorhynchus
|
new DiademResourceInfo(30012, 1, 0, 15, 2), //Grade 2 Artisanal Skybuilders' Rhamphorhynchus
|
||||||
new DiademResourceInfo(30013, 1, 0, 15), //Grade 2 Artisanal Skybuilders' Dragon's Soul
|
new DiademResourceInfo(30013, 1, 0, 15, 2), //Grade 2 Artisanal Skybuilders' Dragon's Soul
|
||||||
|
|
||||||
new DiademResourceInfo(31596, 1, 0, 12), //Grade 3 Artisanal Skybuilders' Oscar
|
new DiademResourceInfo(31596, 1, 0, 12, 3), //Grade 3 Artisanal Skybuilders' Oscar
|
||||||
new DiademResourceInfo(31597, 1, 0, 22), //Grade 3 Artisanal Skybuilders' Blind Manta
|
new DiademResourceInfo(31597, 1, 0, 22, 3), //Grade 3 Artisanal Skybuilders' Blind Manta
|
||||||
new DiademResourceInfo(31598, 1, 0, 83), //Grade 3 Artisanal Skybuilders' Mosasaur
|
new DiademResourceInfo(31598, 1, 0, 83, 3), //Grade 3 Artisanal Skybuilders' Mosasaur
|
||||||
new DiademResourceInfo(31599, 1, 0, 93), //Grade 3 Artisanal Skybuilders' Storm Chaser
|
new DiademResourceInfo(31599, 1, 0, 93, 3), //Grade 3 Artisanal Skybuilders' Storm Chaser
|
||||||
new DiademResourceInfo(31600, 1, 0, 57), //Grade 3 Artisanal Skybuilders' Archaeopteryx
|
new DiademResourceInfo(31600, 1, 0, 57, 3), //Grade 3 Artisanal Skybuilders' Archaeopteryx
|
||||||
new DiademResourceInfo(31601, 1, 0, 90), //Grade 3 Artisanal Skybuilders' Wyvern
|
new DiademResourceInfo(31601, 1, 0, 90, 3), //Grade 3 Artisanal Skybuilders' Wyvern
|
||||||
new DiademResourceInfo(31602, 1, 0, 77), //Grade 3 Artisanal Skybuilders' Cloudshark
|
new DiademResourceInfo(31602, 1, 0, 77, 3), //Grade 3 Artisanal Skybuilders' Cloudshark
|
||||||
new DiademResourceInfo(31603, 1, 0, 113), //Grade 3 Artisanal Skybuilders' Helicoprion
|
new DiademResourceInfo(31603, 1, 0, 113, 3), //Grade 3 Artisanal Skybuilders' Helicoprion
|
||||||
|
|
||||||
new DiademResourceInfo(32882, 1, 2, 0), //Grade 4 Skybuilders' Zagas Khaal
|
new DiademResourceInfo(32882, 1, 2, 0, -1), //Grade 4 Skybuilders' Zagas Khaal
|
||||||
new DiademResourceInfo(32883, 1, 2, 0), //Grade 4 Skybuilders' Goldsmith Crab
|
new DiademResourceInfo(32883, 1, 2, 0, -1), //Grade 4 Skybuilders' Goldsmith Crab
|
||||||
new DiademResourceInfo(32884, 1, 4, 0), //Grade 4 Skybuilders' Common Bitterling
|
new DiademResourceInfo(32884, 1, 4, 0, -1), //Grade 4 Skybuilders' Common Bitterling
|
||||||
new DiademResourceInfo(32885, 1, 4, 0), //Grade 4 Skybuilders' Skyloach
|
new DiademResourceInfo(32885, 1, 4, 0, -1), //Grade 4 Skybuilders' Skyloach
|
||||||
new DiademResourceInfo(32886, 1, 4, 0), //Grade 4 Skybuilders' Glacier Core
|
new DiademResourceInfo(32886, 1, 4, 0, -1), //Grade 4 Skybuilders' Glacier Core
|
||||||
new DiademResourceInfo(32887, 1, 4, 0), //Grade 4 Skybuilders' Kissing Fish
|
new DiademResourceInfo(32887, 1, 4, 0, -1), //Grade 4 Skybuilders' Kissing Fish
|
||||||
new DiademResourceInfo(32888, 1, 8, 0), //Grade 4 Skybuilders' Cavalry Catfish
|
new DiademResourceInfo(32888, 1, 8, 0, -1), //Grade 4 Skybuilders' Cavalry Catfish
|
||||||
new DiademResourceInfo(32889, 1, 8, 0), //Grade 4 Skybuilders' Manasail
|
new DiademResourceInfo(32889, 1, 8, 0, -1), //Grade 4 Skybuilders' Manasail
|
||||||
new DiademResourceInfo(32890, 1, 4, 0), //Grade 4 Skybuilders' Starflower
|
new DiademResourceInfo(32890, 1, 4, 0, -1), //Grade 4 Skybuilders' Starflower
|
||||||
new DiademResourceInfo(32891, 1, 4, 0), //Grade 4 Skybuilders' Cyan Crab
|
new DiademResourceInfo(32891, 1, 4, 0, -1), //Grade 4 Skybuilders' Cyan Crab
|
||||||
new DiademResourceInfo(32892, 1, 10, 0), //Grade 4 Skybuilders' Fickle Krait
|
new DiademResourceInfo(32892, 1, 10, 0, -1), //Grade 4 Skybuilders' Fickle Krait
|
||||||
new DiademResourceInfo(32893, 1, 10, 0), //Grade 4 Skybuilders' Proto-hropken
|
new DiademResourceInfo(32893, 1, 10, 0, -1), //Grade 4 Skybuilders' Proto-hropken
|
||||||
new DiademResourceInfo(32894, 1, 3, 2), //Grade 4 Skybuilders' Ghost Faerie
|
new DiademResourceInfo(32894, 1, 3, 2, -1), //Grade 4 Skybuilders' Ghost Faerie
|
||||||
new DiademResourceInfo(32895, 1, 5, 5), //Grade 4 Skybuilders' Ashfish
|
new DiademResourceInfo(32895, 1, 5, 5, -1), //Grade 4 Skybuilders' Ashfish
|
||||||
new DiademResourceInfo(32896, 1, 10, 8), //Grade 4 Skybuilders' Whitehorse
|
new DiademResourceInfo(32896, 1, 10, 8, -1), //Grade 4 Skybuilders' Whitehorse
|
||||||
new DiademResourceInfo(32897, 1, 6, 4), //Grade 4 Skybuilders' Ocean Cloud
|
new DiademResourceInfo(32897, 1, 6, 4, -1), //Grade 4 Skybuilders' Ocean Cloud
|
||||||
new DiademResourceInfo(32898, 1, 12, 10), //Grade 4 Skybuilders' Black Fanfish
|
new DiademResourceInfo(32898, 1, 12, 10, -1), //Grade 4 Skybuilders' Black Fanfish
|
||||||
new DiademResourceInfo(32899, 1, 12, 10), //Grade 4 Skybuilders' Sunfish
|
new DiademResourceInfo(32899, 1, 12, 10, -1), //Grade 4 Skybuilders' Sunfish
|
||||||
new DiademResourceInfo(32900, 1, 17, 106), //Grade 4 Artisanal Skybuilders' Sweatfish
|
new DiademResourceInfo(32900, 1, 17, 106, 4), //Grade 4 Artisanal Skybuilders' Sweatfish
|
||||||
new DiademResourceInfo(32901, 1, 17, 250), //Grade 4 Artisanal Skybuilders' Sculptor
|
new DiademResourceInfo(32901, 1, 17, 250, 4), //Grade 4 Artisanal Skybuilders' Sculptor
|
||||||
new DiademResourceInfo(32902, 1, 124, 911), //Grade 4 Artisanal Skybuilders' Little Thalaos
|
new DiademResourceInfo(32902, 1, 124, 911, 4), //Grade 4 Artisanal Skybuilders' Little Thalaos
|
||||||
new DiademResourceInfo(32903, 1, 64, 996), //Grade 4 Artisanal Skybuilders' Lightning Chaser
|
new DiademResourceInfo(32903, 1, 64, 996, 4), //Grade 4 Artisanal Skybuilders' Lightning Chaser
|
||||||
new DiademResourceInfo(32904, 1, 77, 512), //Grade 4 Artisanal Skybuilders' Marrella
|
new DiademResourceInfo(32904, 1, 77, 512, 4), //Grade 4 Artisanal Skybuilders' Marrella
|
||||||
new DiademResourceInfo(32905, 1, 45, 542), //Grade 4 Artisanal Skybuilders' Crimson Namitaro
|
new DiademResourceInfo(32905, 1, 45, 542, 4), //Grade 4 Artisanal Skybuilders' Crimson Namitaro
|
||||||
new DiademResourceInfo(32906, 1, 153, 982), //Grade 4 Artisanal Skybuilders' Griffin
|
new DiademResourceInfo(32906, 1, 153, 982, 4), //Grade 4 Artisanal Skybuilders' Griffin
|
||||||
new DiademResourceInfo(32907, 1, 126, 1078), //Grade 4 Artisanal Skybuilders' Meganeura
|
new DiademResourceInfo(32907, 1, 126, 1078, 4), //Grade 4 Artisanal Skybuilders' Meganeura
|
||||||
};
|
};
|
||||||
|
|
||||||
const int IconScrip = 65073;
|
const int IconScrip = 65073;
|
||||||
@ -189,6 +190,7 @@ namespace DiademCalculator
|
|||||||
private int updatePresetIndex;
|
private int updatePresetIndex;
|
||||||
private int minPoints, btnPoints, fshPoints;
|
private int minPoints, btnPoints, fshPoints;
|
||||||
private int minScrips, btnScrips, fshScrips;
|
private int minScrips, btnScrips, fshScrips;
|
||||||
|
private string minPpp, btnPpp, fshPpp;
|
||||||
|
|
||||||
|
|
||||||
public Plugin()
|
public Plugin()
|
||||||
@ -237,10 +239,9 @@ namespace DiademCalculator
|
|||||||
void DrawStats()
|
void DrawStats()
|
||||||
{
|
{
|
||||||
ImGui.SetNextWindowPos(new Vector2(350, 185), ImGuiCond.FirstUseEver);
|
ImGui.SetNextWindowPos(new Vector2(350, 185), ImGuiCond.FirstUseEver);
|
||||||
ImGui.SetNextWindowSize(new Vector2(120, 175), ImGuiCond.Always);
|
|
||||||
ImGui.SetNextWindowBgAlpha(config.BackgroundAlpha);
|
ImGui.SetNextWindowBgAlpha(config.BackgroundAlpha);
|
||||||
|
|
||||||
var flags = ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoScrollbar;
|
var flags = ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar;
|
||||||
if (config.LockWindow)
|
if (config.LockWindow)
|
||||||
flags |= ImGuiWindowFlags.NoMouseInputs | ImGuiWindowFlags.NoInputs;
|
flags |= ImGuiWindowFlags.NoMouseInputs | ImGuiWindowFlags.NoInputs;
|
||||||
|
|
||||||
@ -251,13 +252,13 @@ namespace DiademCalculator
|
|||||||
switch (updatePresetIndex)
|
switch (updatePresetIndex)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
CalculatePoints(_minerPreset, out minPoints, out minScrips);
|
CalculatePoints(_minerPreset, out minPoints, out minScrips, out minPpp);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
CalculatePoints(_botanistPreset, out btnPoints, out btnScrips);
|
CalculatePoints(_botanistPreset, out btnPoints, out btnScrips, out btnPpp);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
CalculatePoints(_fisherPreset, out fshPoints, out fshScrips);
|
CalculatePoints(_fisherPreset, out fshPoints, out fshScrips, out fshPpp);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -268,37 +269,48 @@ namespace DiademCalculator
|
|||||||
lastUpdate = DateTime.Now;
|
lastUpdate = DateTime.Now;
|
||||||
}
|
}
|
||||||
|
|
||||||
DrawIcon(iconsManager.GetIcon(IconBTN), new Vector2(5, 5));
|
if (minPoints != 0 || !string.IsNullOrEmpty(minPpp))
|
||||||
DrawPoints(new Vector2(50, 10), btnPoints);
|
{
|
||||||
|
DrawIcon(iconsManager.GetIcon(IconMIN));
|
||||||
|
DrawPoints(minPoints, minPpp);
|
||||||
|
}
|
||||||
|
|
||||||
DrawIcon(iconsManager.GetIcon(IconMIN), new Vector2(5, 45));
|
if (btnPoints != 0 || !string.IsNullOrEmpty(btnPpp))
|
||||||
DrawPoints(new Vector2(50, 50), minPoints);
|
{
|
||||||
|
DrawIcon(iconsManager.GetIcon(IconBTN));
|
||||||
|
DrawPoints(btnPoints, btnPpp);
|
||||||
|
}
|
||||||
|
|
||||||
DrawIcon(iconsManager.GetIcon(IconFSH), new Vector2(5, 85));
|
if (fshPoints != 0 || !string.IsNullOrEmpty(fshPpp))
|
||||||
DrawPoints(new Vector2(50, 90), fshPoints);
|
{
|
||||||
|
DrawIcon(iconsManager.GetIcon(IconFSH));
|
||||||
|
DrawPoints(fshPoints, fshPpp);
|
||||||
|
}
|
||||||
|
|
||||||
DrawIcon(iconsManager.GetIcon(IconScrip), new Vector2(5, 135));
|
if (minScrips + btnScrips + fshScrips > 0)
|
||||||
DrawPoints(new Vector2(50, 140), minScrips + btnScrips + fshScrips);
|
{
|
||||||
|
DrawIcon(iconsManager.GetIcon(IconScrip));
|
||||||
|
DrawPoints(minScrips + btnScrips + fshScrips, string.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
ImGui.End();
|
ImGui.End();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawIcon(TextureWrap iconTex, Vector2 localPos)
|
void DrawIcon(TextureWrap iconTex)
|
||||||
{
|
{
|
||||||
if (iconTex == null)
|
if (iconTex == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var windowPos = ImGui.GetWindowPos();
|
ImGui.Image(iconTex.ImGuiHandle, new Vector2(iconTex.Width, iconTex.Height));
|
||||||
var size = new Vector2(iconTex.Width, iconTex.Height);
|
|
||||||
|
|
||||||
var drawList = ImGui.GetWindowDrawList();
|
|
||||||
drawList.AddImage(iconTex.ImGuiHandle, windowPos + localPos, windowPos + localPos + size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawPoints(Vector2 localPos, int count)
|
void DrawPoints(int count, string ppp)
|
||||||
{
|
{
|
||||||
ImGui.SetCursorPos(localPos);
|
ImGui.SameLine();
|
||||||
ImGui.Text(count.ToString());
|
if (!string.IsNullOrEmpty(ppp))
|
||||||
|
ppp = $"\n{ppp}";
|
||||||
|
|
||||||
|
ImGui.Text($"{count:N0}{ppp}");
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawConfig()
|
void DrawConfig()
|
||||||
@ -323,20 +335,33 @@ namespace DiademCalculator
|
|||||||
ImGui.End();
|
ImGui.End();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CalculatePoints(List<DiademResourceInfo> preset, out int points, out int scrips)
|
void CalculatePoints(List<DiademResourceInfo> preset, out int points, out int scrips, out string pointsPerPhase)
|
||||||
{
|
{
|
||||||
points = scrips = 0;
|
points = scrips = 0;
|
||||||
|
pointsPerPhase = string.Empty;
|
||||||
|
|
||||||
var manager = InventoryManager.Instance();
|
var manager = InventoryManager.Instance();
|
||||||
if (manager == null)
|
if (manager == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Dictionary<int, int> ppp = new()
|
||||||
|
{
|
||||||
|
{ 2, 0 },
|
||||||
|
{ 3, 0 },
|
||||||
|
{ 4, 0 },
|
||||||
|
};
|
||||||
|
|
||||||
foreach (var item in preset)
|
foreach (var item in preset)
|
||||||
{
|
{
|
||||||
var count = manager->GetInventoryItemCount(item.Id, false, false, false) / item.Set;
|
int count = manager->GetInventoryItemCount(item.Id, false, false, false) / item.Set;
|
||||||
points += count * item.PointsReward;
|
points += count * item.PointsReward;
|
||||||
scrips += count * item.ScripsReward;
|
scrips += count * item.ScripsReward;
|
||||||
|
|
||||||
|
if (item.Phase != -1)
|
||||||
|
ppp[item.Phase] += count * item.Set;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pointsPerPhase = string.Join("\n", ppp.Where(x => x.Value > 0).Select(x => $"P{x.Key}={x.Value:N0}"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user