Compare commits

...

3 Commits

Author SHA1 Message Date
Anna 6fbb9c0413
chore: update repo url 2021-12-06 19:17:24 -05:00
Anna fc9708b83e
chore: bump version to 1.4.1 2021-12-06 19:15:04 -05:00
Anna 1b5f6cf39d
fix: update to 6.0 2021-12-06 19:14:44 -05:00
4 changed files with 12 additions and 11 deletions

View File

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

View File

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net5-windows</TargetFramework>
<RootNamespace>QuestMap</RootNamespace>
<Version>1.4.0</Version>
<Version>1.4.1</Version>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -40,9 +40,9 @@
<ItemGroup>
<PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/>
<PackageReference Include="DalamudLinter" Version="1.0.3"/>
<PackageReference Include="DalamudPackager" Version="2.1.2"/>
<PackageReference Include="System.Threading.Channels" Version="5.0.0"/>
<PackageReference Include="XivCommon" Version="3.0.2"/>
<PackageReference Include="DalamudPackager" Version="2.1.5"/>
<PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
<PackageReference Include="XivCommon" Version="4.0.0-alpha.1"/>
</ItemGroup>
<ItemGroup>

View File

@ -11,4 +11,4 @@ description: |-
Icons: treasure map by Anthony Ledoux from the Noun Project and
locked book by Anthony Ledoux from the Noun Project
repo_url: https://git.sr.ht/~jkcclemens/QuestMap
repo_url: https://git.annaclemens.io/ascclemens/QuestMap

View File

@ -52,7 +52,7 @@ namespace QuestMap {
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);
if (item == null) {
continue;
@ -69,7 +69,7 @@ namespace QuestMap {
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;
List<Item> rewards;
@ -248,6 +248,7 @@ namespace QuestMap {
69552 => "Futures Rewritten (5.4)",
69599 => "Death Unto Dawn - Part 1 (5.5)",
69602 => "Death Unto Dawn - Part 2 (5.55)",
70000 => "Endwalker (6.0)",
_ => null,
};