kaiserbh/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests Activity

Explicitly specify territoryId in NearPosition

Browse Source
This commit is contained in:
Liza 2024-09-02 21:36:34 +02:00
parent 8848947aca
commit 617e1d11c3
Signed by: liza
GPG Key ID: 7199F8D727D55F67
19 changed files with 79 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
View File

@ -109,6 +109,9 @@ internal static class SkipConditionsExtensions
.AsSyntaxNodeOrToken(),
Assignment(nameof(NearPositionCondition.MaximumDistance),
nearPositionCondition.MaximumDistance, emptyCondition.MaximumDistance)
.AsSyntaxNodeOrToken(),
Assignment(nameof(NearPositionCondition.TerritoryId),
nearPositionCondition.TerritoryId, emptyCondition.TerritoryId)
.AsSyntaxNodeOrToken()))));
}

6
QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json
View File

@ -35,7 +35,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -150,7 +151,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

12
QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json
View File

@ -35,7 +35,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -202,7 +203,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -293,7 +295,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -409,7 +412,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

6
QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json
View File

@ -35,7 +35,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -194,7 +195,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

6
QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json
View File

@ -35,7 +35,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -117,7 +118,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

3
QuestPaths/3.x - Heavensward/Class Quests/WHM/1719_Taint Misbehaving.json
View File

@ -35,7 +35,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

3
QuestPaths/3.x - Heavensward/Class Quests/WHM/1724_Trials of the Padjals.json
View File

@ -56,7 +56,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

9
QuestPaths/3.x - Heavensward/Class Quests/WHM/1725_Hands of Healing.json
View File

@ -35,7 +35,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -116,7 +117,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}
@ -244,7 +246,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

16
QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
View File

@ -13,7 +13,21 @@
"Z": 403.3722
},
"TerritoryId": 622,
"InteractionType": "AcceptQuest"
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Azim Steppe - Reunion",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 525.10876,
"Y": -19.50681,
"Z": 403.3722
},
"MaximumDistance": 100,
"TerritoryId": 622
}
}
}
}
]
},

3
QuestPaths/4.x - Stormblood/Class Quests/WHM/2414_Unease in East End.json
View File

@ -35,7 +35,8 @@
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
"MaximumDistance": 3,
"TerritoryId": 153
}
}
}

3
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json
View File

@ -23,7 +23,8 @@
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
"MaximumDistance": 100,
"TerritoryId": 815
}
}
}

3
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json
View File

@ -23,7 +23,8 @@
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
"MaximumDistance": 100,
"TerritoryId": 815
}
}
}

3
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json
View File

@ -23,7 +23,8 @@
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
"MaximumDistance": 100,
"TerritoryId": 815
}
}
}

3
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json
View File

@ -23,7 +23,8 @@
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
"MaximumDistance": 100,
"TerritoryId": 815
}
}
}

3
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json
View File

@ -23,7 +23,8 @@
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
"MaximumDistance": 100,
"TerritoryId": 815
}
}
}

3
QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4610_A Brewing Reputation.json
View File

@ -157,7 +157,8 @@
"Y": 437.5829,
"Z": 333.63843
},
"MaximumDistance": 100
"MaximumDistance": 100,
"TerritoryId": 960
}
}
}

12
QuestPaths/quest-v1.json
View File

@ -261,11 +261,15 @@
},
"MaximumDistance": {
"type": "number"
},
"TerritoryId": {
"type": "number"
}
},
"required": [
"Position",
"MaximumDistance"
"MaximumDistance",
"TerritoryId"
],
"additionalProperties": false
},
@ -323,11 +327,15 @@
},
"MaximumDistance": {
"type": "number"
},
"TerritoryId": {
"type": "number"
}
},
"required": [
"Position",
"MaximumDistance"
"MaximumDistance",
"TerritoryId"
],
"additionalProperties": false
}

1
Questionable.Model/Questing/NearPositionCondition.cs
View File

@ -9,4 +9,5 @@ public sealed class NearPositionCondition
[JsonConverter(typeof(VectorConverter))]
public Vector3 Position { get; set; }
public float MaximumDistance { get; set; }
public ushort TerritoryId { get; set; }
}

6
Questionable/Validation/Validators/ClassQuestShouldHaveShortcutValidator.cs Normal file
View File

@ -0,0 +1,6 @@
namespace Questionable.Validation.Validators;
public class ClassQuestShouldHaveShortcut
{
}