forks/annas-questmap
1
0
Fork 0
Code

fix: update to 6.0

Browse Source
This commit is contained in:
Anna 2021-12-06 19:14:44 -05:00
parent 94a9403253
commit 13dc5deb61
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Quest Map/PluginUi.cs
View File

@ -535,8 +535,8 @@ namespace QuestMap {
if (quest.ItemRewardType is 0 or 1 or 3 or 5) { if (quest.ItemRewardType is 0 or 1 or 3 or 5) {
DrawItemRewards( DrawItemRewards(
"Rewards", "Rewards",
quest.ItemReward0 quest.ItemReward
.Zip(quest.ItemCountReward0, (id, qty) => (id, qty)) .Zip(quest.ItemCountReward, (id, qty) => (id, qty))
.Where(entry => entry.id != 0) .Where(entry => entry.id != 0)
.Select(entry => (item: this.Plugin.DataManager.GetExcelSheet<Item>()!.GetRow(entry.id), entry.qty)) .Select(entry => (item: this.Plugin.DataManager.GetExcelSheet<Item>()!.GetRow(entry.id), entry.qty))
.Where(entry => entry.item != null) .Where(entry => entry.item != null)
@ -546,8 +546,8 @@ namespace QuestMap {
DrawItemRewards( DrawItemRewards(
"Optional rewards", "Optional rewards",
quest.ItemReward1 quest.OptionalItemReward
.Zip(quest.ItemCountReward1, (row, qty) => (row, qty)) .Zip(quest.OptionalItemCountReward, (row, qty) => (row, qty))
.Where(entry => entry.row.Row != 0) .Where(entry => entry.row.Row != 0)
.Select(entry => (item: entry.row.Value, entry.qty)) .Select(entry => (item: entry.row.Value, entry.qty))
.Where(entry => entry.item != null) .Where(entry => entry.item != null)

6
Quest Map/Quest Map.csproj
View File

@ -40,9 +40,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/> <PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/>
<PackageReference Include="DalamudLinter" Version="1.0.3"/> <PackageReference Include="DalamudLinter" Version="1.0.3"/>
<PackageReference Include="DalamudPackager" Version="2.1.2"/> <PackageReference Include="DalamudPackager" Version="2.1.5"/>
<PackageReference Include="System.Threading.Channels" Version="5.0.0"/> <PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
<PackageReference Include="XivCommon" Version="3.0.2"/> <PackageReference Include="XivCommon" Version="4.0.0-alpha.1"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

5
Quest Map/Quests.cs
View File

@ -52,7 +52,7 @@ namespace QuestMap {
emoteRewards[quest.RowId] = quest.EmoteReward.Value!; emoteRewards[quest.RowId] = quest.EmoteReward.Value!;
} }
foreach (var row in quest.ItemReward0.Where(item => item != 0)) { foreach (var row in quest.ItemReward.Where(item => item != 0)) {
var item = this.Plugin.DataManager.GetExcelSheet<Item>()!.GetRow(row); var item = this.Plugin.DataManager.GetExcelSheet<Item>()!.GetRow(row);
if (item == null) { if (item == null) {
continue; continue;
@ -69,7 +69,7 @@ namespace QuestMap {
rewards.Add(item); rewards.Add(item);
} }
foreach (var row in quest.ItemReward1.Where(item => item.Row != 0)) { foreach (var row in quest.OptionalItemReward.Where(item => item.Row != 0)) {
var item = row.Value; var item = row.Value;
List<Item> rewards; List<Item> rewards;
@ -248,6 +248,7 @@ namespace QuestMap {
69552 => "Futures Rewritten (5.4)", 69552 => "Futures Rewritten (5.4)",
69599 => "Death Unto Dawn - Part 1 (5.5)", 69599 => "Death Unto Dawn - Part 1 (5.5)",
69602 => "Death Unto Dawn - Part 2 (5.55)", 69602 => "Death Unto Dawn - Part 2 (5.55)",
70000 => "Endwalker (6.0)",
_ => null, _ => null,
}; };