1
0
forked from liza/Questionable

Add Heritage Found side quests

This commit is contained in:
Liza 2024-07-19 01:15:55 +02:00
parent a42bcf0fdd
commit da2c505c13
Signed by: liza
GPG Key ID: 7199F8D727D55F67
21 changed files with 1309 additions and 6 deletions

View File

@ -0,0 +1,64 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1051600,
"Position": {
"X": 111.16199,
"Y": 4,
"Z": -98.92432
},
"TerritoryId": 131,
"InteractionType": "AcceptQuest",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_KINGYR301_05187_Q1_000_000",
"Answer": "TEXT_KINGYR301_05187_A1_000_002"
}
]
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1051601,
"Position": {
"X": -45.5177,
"Y": 7.9999995,
"Z": -100.72485
},
"TerritoryId": 130,
"InteractionType": "Interact",
"AetheryteShortcut": "Ul'dah"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1051600,
"Position": {
"X": 111.16199,
"Y": 4,
"Z": -98.92432
},
"TerritoryId": 131,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Sapphire Avenue Exchange"
]
}
]
}
]
}

View File

@ -0,0 +1,114 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1049442,
"Position": {
"X": -272.23627,
"Y": 30.001156,
"Z": -577.59973
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2014079,
"Position": {
"X": -213.24487,
"Y": 30.838379,
"Z": -618.0362
},
"StopDistance": 0.25,
"TerritoryId": 1191,
"InteractionType": "UseItem",
"ItemId": 2003594,
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2014078,
"Position": {
"X": -272.8161,
"Y": 37.857544,
"Z": -504.9058
},
"StopDistance": 0.25,
"TerritoryId": 1191,
"InteractionType": "UseItem",
"ItemId": 2003594,
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2014080,
"Position": {
"X": -349.1112,
"Y": 37.857544,
"Z": -610.5898
},
"StopDistance": 0.25,
"TerritoryId": 1191,
"InteractionType": "UseItem",
"ItemId": 2003594,
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -270.87784,
"Y": 30,
"Z": -577.24225
},
"TerritoryId": 1191,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1049442,
"Position": {
"X": -272.23627,
"Y": 30.001156,
"Z": -577.59973
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,95 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1049465,
"Position": {
"X": -333.3944,
"Y": 43.50267,
"Z": -643.64087
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -316.46542,
"Y": 38.99998,
"Z": -622.67126
},
"TerritoryId": 1191,
"InteractionType": "WalkTo",
"Mount": true
},
{
"DataId": 1049475,
"Position": {
"X": -69.87109,
"Y": 36.567646,
"Z": -217.39532
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2014084,
"Position": {
"X": -69.68799,
"Y": 36.972534,
"Z": -215.7168
},
"StopDistance": 4.5,
"TerritoryId": 1191,
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_KINGZF002_05150_Q1_100_008",
"Yes": true
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -316.46542,
"Y": 38.99998,
"Z": -622.67126
},
"TerritoryId": 1191,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1049465,
"Position": {
"X": -333.3944,
"Y": 43.50267,
"Z": -643.64087
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,103 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1050659,
"Position": {
"X": -215.198,
"Y": 36.994804,
"Z": -497.85614
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1050659,
"Position": {
"X": -215.198,
"Y": 36.994804,
"Z": -497.85614
},
"TerritoryId": 1191,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1050659,
"Position": {
"X": -185.05022,
"Y": 30.989729,
"Z": -513.96875
},
"StopDistance": 0.5,
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1050659,
"Position": {
"X": -196.74313,
"Y": 34.982788,
"Z": -643.43665
},
"StopDistance": 0.5,
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1050659,
"Position": {
"X": -165.5087,
"Y": 38.967262,
"Z": -706.4246
},
"StopDistance": 0.5,
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1050659,
"Position": {
"X": -215.198,
"Y": 36.994804,
"Z": -497.85614
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,107 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1050660,
"Position": {
"X": 421.8661,
"Y": 90,
"Z": -476.67664
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1050661,
"Position": {
"X": -136.09528,
"Y": 26.068634,
"Z": -509.39197
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"AetheryteShortcut": "Heritage Found - The Outskirts",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1050661,
"Position": {
"X": -136.09528,
"Y": 26.068634,
"Z": -509.39197
},
"TerritoryId": 1191,
"InteractionType": "Emote",
"Emote": "cheer",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1050662,
"Position": {
"X": 149.7367,
"Y": 48.34552,
"Z": -463.5844
},
"TerritoryId": 1191,
"InteractionType": "Emote",
"Emote": "cheer",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1050727,
"Position": {
"X": 309.65125,
"Y": 71.38871,
"Z": -473.68585
},
"StopDistance": 0.25,
"TerritoryId": 1191,
"InteractionType": "Emote",
"Emote": "psych",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1050660,
"Position": {
"X": 421.8661,
"Y": 90,
"Z": -476.67664
},
"StopDistance": 0.25,
"TerritoryId": 1191,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,52 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1051378,
"Position": {
"X": -184.89362,
"Y": 29.978386,
"Z": -584.52734
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1051379,
"Position": {
"X": -324.51367,
"Y": 36.98768,
"Z": -554.00934
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1051380,
"Position": {
"X": -323.72015,
"Y": 36.98504,
"Z": -555.8404
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,135 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1049500,
"Position": {
"X": -591.76013,
"Y": -2.503842,
"Z": -502.09814
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -731.0091,
"Y": 10.949384,
"Z": -113.12315
},
"TerritoryId": 1191,
"InteractionType": "WalkTo",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
-128
]
},
{
"DataId": 2014091,
"Position": {
"X": -732.44836,
"Y": 11.459534,
"Z": -110.185425
},
"StopDistance": 4,
"TerritoryId": 1191,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2014092,
"Position": {
"X": -771.93866,
"Y": 8.2855835,
"Z": -37.583008
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"Position": {
"X": -646.74786,
"Y": 17.395247,
"Z": 39.380535
},
"TerritoryId": 1191,
"InteractionType": "WalkTo",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
-32
]
},
{
"DataId": 2014093,
"Position": {
"X": -645.3804,
"Y": 17.837708,
"Z": 39.230957
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1049500,
"Position": {
"X": -591.76013,
"Y": -2.503842,
"Z": -502.09814
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Heritage Found - The Outskirts",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,63 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1049488,
"Position": {
"X": -195.23926,
"Y": 31.00003,
"Z": 142.90063
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -50.850063,
"Y": 67.24198,
"Z": 182.26367
},
"TerritoryId": 1191,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1050667,
"Position": {
"X": -51.46869,
"Y": 66.87813,
"Z": 180.07166
},
"TerritoryId": 1191,
"InteractionType": "Emote",
"Emote": "poke"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1049488,
"Position": {
"X": -195.23926,
"Y": 31.00003,
"Z": 142.90063
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Heritage Found - Electrope Strike"
}
]
}
]
}

View File

@ -0,0 +1,90 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1049489,
"Position": {
"X": -250.04962,
"Y": 31.000015,
"Z": 134.7218
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -174.01418,
"Y": 31.361284,
"Z": 268.5205
},
"StopDistance": 0.5,
"TerritoryId": 1191,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
17682,
17683
],
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"Position": {
"X": -352.59204,
"Y": 39.809544,
"Z": -44.773865
},
"StopDistance": 0.5,
"TerritoryId": 1191,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
17680,
17681
],
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1049489,
"Position": {
"X": -250.04962,
"Y": 31.000015,
"Z": 134.7218
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Heritage Found - Electrope Strike"
}
]
}
]
}

View File

@ -0,0 +1,139 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1050806,
"Position": {
"X": -151.99518,
"Y": 34.94368,
"Z": -581.23145
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1050802,
"Position": {
"X": -153.09375,
"Y": 34.946026,
"Z": -581.0178
},
"TerritoryId": 1191,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1050807,
"Position": {
"X": -165.97241,
"Y": 25.979595,
"Z": -502.80005
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_KINGZF202_05161_Q1_000_001",
"Answer": "TEXT_KINGZF202_05161_A1_000_003"
}
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2014035,
"Position": {
"X": -61.478638,
"Y": 35.355103,
"Z": -294.75854
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2014036,
"Position": {
"X": -99.53461,
"Y": 36.9115,
"Z": -233.47827
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2014037,
"Position": {
"X": -38.31543,
"Y": 37.979614,
"Z": -221.5763
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1050802,
"Position": {
"X": -153.09375,
"Y": 34.946026,
"Z": -581.0178
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Heritage Found - The Outskirts",
"Fly": true,
"NextQuestId": 5162
}
]
}
]
}

View File

@ -0,0 +1,86 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1050802,
"Position": {
"X": -153.09375,
"Y": 34.946026,
"Z": -581.0178
},
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1050809,
"Position": {
"X": -59.372925,
"Y": 42.99715,
"Z": -637.2626
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1050810,
"Position": {
"X": -44.480103,
"Y": 33.495888,
"Z": -306.99628
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1050810,
"Position": {
"X": 516.28033,
"Y": 145.60376,
"Z": 228.34976
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"AetheryteShortcut": "Heritage Found - Yyasulani Station"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1050806,
"Position": {
"X": -151.99518,
"Y": 34.94368,
"Z": -581.23145
},
"StopDistance": 5,
"TerritoryId": 1191,
"InteractionType": "CompleteQuest",
"NextQuestId": 5163
}
]
}
]
}

View File

@ -0,0 +1,106 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1050806,
"Position": {
"X": -151.99518,
"Y": 34.94368,
"Z": -581.23145
},
"StopDistance": 5,
"TerritoryId": 1191,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1050957,
"Position": {
"X": -59.372925,
"Y": 42.99715,
"Z": -637.2626
},
"TerritoryId": 1191,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2014063,
"Position": {
"X": 46.00586,
"Y": 34.01233,
"Z": -411.33746
},
"StopDistance": 0.5,
"TerritoryId": 1191,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
17685
],
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2014077,
"Position": {
"X": -22.110352,
"Y": 34.6532,
"Z": -268.9403
},
"StopDistance": 0.5,
"TerritoryId": 1191,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
17685
],
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1050811,
"Position": {
"X": -97.0932,
"Y": 28.796848,
"Z": -446.7079
},
"TerritoryId": 1191,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,129 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1051381,
"Position": {
"X": 261.7074,
"Y": 59.699993,
"Z": 5.0201416
},
"TerritoryId": 1186,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1051381,
"Position": {
"X": 261.7074,
"Y": 59.699993,
"Z": 5.0201416
},
"TerritoryId": 1186,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1051382,
"Position": {
"X": 317.46387,
"Y": 70.75,
"Z": -64.01166
},
"TerritoryId": 1186,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1051383,
"Position": {
"X": 363.24097,
"Y": 50.75,
"Z": 185.77856
},
"TerritoryId": 1186,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 1051384,
"Position": {
"X": 253.52856,
"Y": 50.3,
"Z": 189.07446
},
"TerritoryId": 1186,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1051385,
"Position": {
"X": 451.5907,
"Y": 61.38527,
"Z": 319.44763
},
"TerritoryId": 1186,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Solution Nine] Neon Stein",
"[Solution Nine] The Arcadion"
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1051386,
"Position": {
"X": 453.1776,
"Y": 61.38527,
"Z": 321.85852
},
"TerritoryId": 1186,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -183,7 +183,8 @@
"DifferentTerritory", "DifferentTerritory",
"ChocoboUnlocked", "ChocoboUnlocked",
"AetheryteShortcutIfInSameTerritory", "AetheryteShortcutIfInSameTerritory",
"NotTargetable" "NotTargetable",
"ItemNotInInventory"
] ]
} }
}, },

View File

@ -12,5 +12,6 @@ public sealed class SkipConditionConverter() : EnumConverter<ESkipCondition>(Val
{ ESkipCondition.ChocoboUnlocked, "ChocoboUnlocked" }, { ESkipCondition.ChocoboUnlocked, "ChocoboUnlocked" },
{ ESkipCondition.AetheryteShortcutIfInSameTerritory, "AetheryteShortcutIfInSameTerritory" }, { ESkipCondition.AetheryteShortcutIfInSameTerritory, "AetheryteShortcutIfInSameTerritory" },
{ ESkipCondition.NotTargetable, "NotTargetable" }, { ESkipCondition.NotTargetable, "NotTargetable" },
{ ESkipCondition.ItemNotInInventory, "ItemNotInInventory" },
}; };
} }

View File

@ -13,4 +13,5 @@ public enum ESkipCondition
ChocoboUnlocked, ChocoboUnlocked,
AetheryteShortcutIfInSameTerritory, AetheryteShortcutIfInSameTerritory,
NotTargetable, NotTargetable,
ItemNotInInventory,
} }

View File

@ -89,10 +89,7 @@ internal sealed class MovementController : IDisposable
{ {
if (_pathfindTask.IsCompletedSuccessfully) if (_pathfindTask.IsCompletedSuccessfully)
{ {
_logger.LogInformation("Pathfinding complete, route: [{Route}]", _logger.LogInformation("Pathfinding complete, got {Count} points", _pathfindTask.Result.Count);
string.Join(" → ",
_pathfindTask.Result.Select(x => x.ToString("G", CultureInfo.InvariantCulture))));
if (_pathfindTask.Result.Count == 0) if (_pathfindTask.Result.Count == 0)
{ {
ResetPathfinding(); ResetPathfinding();
@ -115,6 +112,10 @@ internal sealed class MovementController : IDisposable
if (!Destination.IsFlying) if (!Destination.IsFlying)
_movementOverrideController.AdjustPath(navPoints); _movementOverrideController.AdjustPath(navPoints);
_logger.LogInformation("Navigating via route: [{Route}]",
string.Join(" → ",
_pathfindTask.Result.Select(x => x.ToString("G", CultureInfo.InvariantCulture))));
_navmeshIpc.MoveTo(navPoints, Destination.IsFlying); _navmeshIpc.MoveTo(navPoints, Destination.IsFlying);
MovementStartedAt = DateTime.Now; MovementStartedAt = DateTime.Now;

View File

@ -17,6 +17,10 @@ internal sealed class MovementOverrideController
new BlacklistedPoint(132, new(45.5f, -8f, 101f), new(50.53978f, -8.046954f, 101.06045f)), new BlacklistedPoint(132, new(45.5f, -8f, 101f), new(50.53978f, -8.046954f, 101.06045f)),
new BlacklistedPoint(1189, new(574f, -142.25f, 504.25f), new(574.44183f, -142.12766f, 507.60065f)), new BlacklistedPoint(1189, new(574f, -142.25f, 504.25f), new(574.44183f, -142.12766f, 507.60065f)),
// heritage found: yyupye's halo (farm, npc: Mahuwsa)
new BlacklistedPoint(1191, new(-108f, 29.25f, -350.75f), new(-107.56289f, 29.008266f, -348.80087f)),
new BlacklistedPoint(1191, new(-105.75f, 29.75f, -351f), new(-105.335304f, 29.017048f, -348.85077f)),
]; ];
private readonly IClientState _clientState; private readonly IClientState _clientState;

View File

@ -145,6 +145,7 @@ internal static class EquipItem
{ {
>= 1 and <= 11 => [(ushort)(item.EquipSlotCategory.Row - 1)], >= 1 and <= 11 => [(ushort)(item.EquipSlotCategory.Row - 1)],
12 => [11, 12], // rings 12 => [11, 12], // rings
13 => [0],
17 => [14], // soul crystal 17 => [14], // soul crystal
_ => null _ => null
}; };

View File

@ -4,6 +4,7 @@ using System.Linq;
using Dalamud.Game.ClientState.Objects.Types; using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions; using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.Game.UI; using FFXIVClientStructs.FFXIV.Client.Game.UI;
using FFXIVClientStructs.FFXIV.Client.System.Framework; using FFXIVClientStructs.FFXIV.Client.System.Framework;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -94,6 +95,16 @@ internal static class SkipCondition
} }
} }
if (SkipConditions.Contains(ESkipCondition.ItemNotInInventory) && Step is { ItemId: not null })
{
InventoryManager* inventoryManager = InventoryManager.Instance();
if (inventoryManager->GetInventoryItemCount(Step.ItemId.Value) == 0)
{
logger.LogInformation("Skipping step, no item with itemId {ItemId} in inventory", Step.ItemId.Value);
return true;
}
}
if (Step is if (Step is
{ {
DataId: not null, DataId: not null,

View File

@ -1,6 +1,6 @@
<Project Sdk="Dalamud.NET.Sdk/9.0.2"> <Project Sdk="Dalamud.NET.Sdk/9.0.2">
<PropertyGroup> <PropertyGroup>
<Version>1.10</Version> <Version>1.11</Version>
<OutputPath>dist</OutputPath> <OutputPath>dist</OutputPath>
<PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap> <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
</PropertyGroup> </PropertyGroup>