forks/annas-questmap
1
0
Fork 0
Code

-----BEGIN PGP SIGNATURE-----

Browse Source 
iHUEABYKAB0WIQTa9butFCxnjN0YMdtxmfjXJ9VfZwUCZR0blgAKCRBxmfjXJ9Vf
 Zw9sAQDiuiu4Mif483GMVRm1XIgQyBkweu6IEZcRNTUKsxRCLgEAkl0U3jNvgS5f
 ld7fv0ZInB+SkPDgkpR5NwXjEMp/kQY=
 =IZrg
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQTa9butFCxnjN0YMdtxmfjXJ9VfZwUCZR0cZQAKCRBxmfjXJ9Vf
 ZxNrAP9f8buNaa4eDfK9Ab/T96livuzNFUO52/xHydysZrifMwD/ZFfcp4foq9gd
 InF5XrbFjIfhDD1BI2dMGcWxzNFpLAU=
 =3c00
 -----END PGP SIGNATURE-----

Merge tag 'v1.4.5'

# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQTa9butFCxnjN0YMdtxmfjXJ9VfZwUCZR0blgAKCRBxmfjXJ9Vf
# Zw9sAQDiuiu4Mif483GMVRm1XIgQyBkweu6IEZcRNTUKsxRCLgEAkl0U3jNvgS5f
# ld7fv0ZInB+SkPDgkpR5NwXjEMp/kQY=
# =IZrg
# -----END PGP SIGNATURE-----
# gpg: Signatur vom 04.10.2023 10:00:22 W. Europe Daylight Time
# gpg:                mittels EDDSA-Schlüssel DAF5BBAD142C678CDD1831DB7199F8D727D55F67
# gpg: Korrekte Signatur von "Liza Carvelli <liza@liza.sh>" [ultimativ]
This commit is contained in:
Liza 2023-10-04 10:03:49 +02:00
commit 4e6a1d4228
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
QuestMap/Node.cs
View File

@ -151,16 +151,10 @@ namespace QuestMap {
} }
internal static IEnumerable<Quest> PreviousQuests(this Quest quest) { internal static IEnumerable<Quest> PreviousQuests(this Quest quest) {
if (quest.PreviousQuest0.Row != 0) { foreach (var previous in quest.PreviousQuest) {
yield return quest.PreviousQuest0.Value!; if (previous != null && previous.Row != 0) {
yield return previous.Value!;
} }
if (quest.PreviousQuest1.Row != 0) {
yield return quest.PreviousQuest1.Value!;
}
if (quest.PreviousQuest2.Row != 0) {
yield return quest.PreviousQuest2.Value!;
} }
} }
} }

10
QuestMap/QuestMap.csproj
View File

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6-windows</TargetFramework> <TargetFramework>net7-windows</TargetFramework>
<RootNamespace>QuestMap</RootNamespace> <RootNamespace>QuestMap</RootNamespace>
<Version>1.4.4</Version> <Version>1.4.5</Version>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -49,9 +49,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/> <PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/>
<PackageReference Include="DalamudPackager" Version="2.1.8"/> <PackageReference Include="DalamudPackager" Version="2.1.10"/>
<PackageReference Include="System.Threading.Channels" Version="6.0.0"/> <PackageReference Include="System.Threading.Channels" Version="7.0.0"/>
<PackageReference Include="XivCommon" Version="6.0.0"/> <PackageReference Include="XivCommon" Version="7.0.0-alpha.1"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

7
QuestMap/Quests.cs
View File

@ -220,8 +220,8 @@ namespace QuestMap {
} }
var name = quest.RowId switch { var name = quest.RowId switch {
66060 => "A Realm Reborn (2.0)", 70058 => "A Realm Reborn (2.0)",
69414 => "A Realm Awoken (2.1)", 66729 => "A Realm Awoken (2.1)",
66899 => "Through the Maelstrom (2.2)", 66899 => "Through the Maelstrom (2.2)",
66996 => "Defenders of Eorzea (2.3)", 66996 => "Defenders of Eorzea (2.3)",
65625 => "Dreams of Ice (2.4)", 65625 => "Dreams of Ice (2.4)",
@ -249,6 +249,9 @@ namespace QuestMap {
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)", 70000 => "Endwalker (6.0)",
70062 => "Newfound Adventure (6.1)",
70136 => "Buried Memory (6.2)",
70214 => "Gods Revel, Lands Tremble (6.3)",
_ => null, _ => null,
}; };

20
QuestMap/packages.lock.json Normal file → Executable file
View File

@ -1,7 +1,7 @@
{ {
"version": 1, "version": 1,
"dependencies": { "dependencies": {
"net6.0-windows7.0": { "net7.0-windows7.0": {
"AutomaticGraphLayout": { "AutomaticGraphLayout": {
"type": "Direct", "type": "Direct",
"requested": "[1.1.12, )", "requested": "[1.1.12, )",
@ -10,21 +10,21 @@
}, },
"DalamudPackager": { "DalamudPackager": {
"type": "Direct", "type": "Direct",
"requested": "[2.1.8, )", "requested": "[2.1.10, )",
"resolved": "2.1.8", "resolved": "2.1.10",
"contentHash": "YqagNXs9InxmqkXzq7kLveImxnodkBEicAhydMXVp7dFjC7xb76U6zGgAax4/BWIWfZeWzr5DJyQSev31kj81A==" "contentHash": "S6NrvvOnLgT4GDdgwuKVJjbFo+8ZEj+JsEYk9ojjOR/MMfv1dIFpT8aRJQfI24rtDcw1uF+GnSSMN4WW1yt7fw=="
}, },
"System.Threading.Channels": { "System.Threading.Channels": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0, )", "requested": "[7.0.0, )",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA=="
}, },
"XivCommon": { "XivCommon": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0, )", "requested": "[7.0.0-alpha.1, )",
"resolved": "6.0.0", "resolved": "7.0.0-alpha.1",
"contentHash": "8HwrC7mnkcaP+JxRoIIu9MqFElQRVL8HOr8EQ6Te+11zzvKoXTZZrZ7VWETF2CHfB+7c1v5wONZKqZJ2hETpjg==" "contentHash": "4Yy4Wg3bnI/g9BSEYAqOZALmVMJZS0wcP847VlUIThBqIS/47O6tw2BI84he4KuPSTfIsYOzrcz3vAia8+Pn3g=="
} }
} }
} }