master #2

Merged
cacahuetes merged 79 commits from liza/Questionable:master into master 2024-08-25 10:51:08 +00:00
4 changed files with 28 additions and 3 deletions
Showing only changes of commit 721c3d0a5c - Show all commits

View File

@ -35,8 +35,8 @@ public sealed class AetheryteConverter() : EnumConverter<EAetheryteLocation>(Val
{ EAetheryteLocation.CoerthasCentralHighlandsCampDragonhead, "Coerthas Central Highlands - Camp Dragonhead" }, { EAetheryteLocation.CoerthasCentralHighlandsCampDragonhead, "Coerthas Central Highlands - Camp Dragonhead" },
{ EAetheryteLocation.MorDhona, "Mor Dhona" }, { EAetheryteLocation.MorDhona, "Mor Dhona" },
{ EAetheryteLocation.GoldSaucer, "Gold Saucer" },
{ EAetheryteLocation.WolvesDenPier, "Wolves' Den Pier" }, { EAetheryteLocation.WolvesDenPier, "Wolves' Den Pier" },
{ EAetheryteLocation.GoldSaucer, "Gold Saucer" },
{ EAetheryteLocation.Ishgard, "Ishgard" }, { EAetheryteLocation.Ishgard, "Ishgard" },
{ EAetheryteLocation.Idyllshire, "Idyllshire" }, { EAetheryteLocation.Idyllshire, "Idyllshire" },

View File

@ -72,9 +72,17 @@ public enum EAetheryteLocation
CoerthasCentralHighlandsCampDragonhead = 23, CoerthasCentralHighlandsCampDragonhead = 23,
MorDhona = 24, MorDhona = 24,
GoldSaucer = 62,
WolvesDenPier = 55, WolvesDenPier = 55,
GoldSaucer = 62,
GoldSaucerEntranceCardSquares = 63,
GoldSaucerWonderSquareEast = 64,
GoldSaucerWonderSquareWest = 65,
GoldSaucerEventSquare = 66,
GoldSaucerCactpotBoard = 67,
GoldSaucerRoundSquare = 68,
GoldSaucerChocoboSquare = 69,
Ishgard = 70, Ishgard = 70,
IshgardForgottenKnight = 80, IshgardForgottenKnight = 80,
IshgardSkysteelManufactory = 81, IshgardSkysteelManufactory = 81,

View File

@ -46,6 +46,15 @@ public sealed class AethernetShardConverter() : EnumConverter<EAetheryteLocation
{ EAetheryteLocation.LimsaTempestGate, "[Limsa Lominsa] Tempest Gate (Lower La Noscea)" }, { EAetheryteLocation.LimsaTempestGate, "[Limsa Lominsa] Tempest Gate (Lower La Noscea)" },
{ EAetheryteLocation.LimsaAirship, "[Limsa Lominsa] Airship Landing" }, { EAetheryteLocation.LimsaAirship, "[Limsa Lominsa] Airship Landing" },
{ EAetheryteLocation.GoldSaucer, "[Gold Saucer] Aetheryte Plaza" },
{ EAetheryteLocation.GoldSaucerEntranceCardSquares, "[Gold Saucer] Entrance & Card Squares" },
{ EAetheryteLocation.GoldSaucerWonderSquareEast, "[Gold Saucer] Wonder Square East" },
{ EAetheryteLocation.GoldSaucerWonderSquareWest, "[Gold Saucer] Wonder Square West" },
{ EAetheryteLocation.GoldSaucerEventSquare, "[Gold Saucer] Event Square" },
{ EAetheryteLocation.GoldSaucerCactpotBoard, "[Gold Saucer] Cactpot Board" },
{ EAetheryteLocation.GoldSaucerRoundSquare, "[Gold Saucer] Round Square" },
{ EAetheryteLocation.GoldSaucerChocoboSquare, "[Gold Saucer] Chocobo Square" },
{ EAetheryteLocation.Ishgard, "[Ishgard] Aetheryte Plaza" }, { EAetheryteLocation.Ishgard, "[Ishgard] Aetheryte Plaza" },
{ EAetheryteLocation.IshgardForgottenKnight, "[Ishgard] The Forgotten Knight" }, { EAetheryteLocation.IshgardForgottenKnight, "[Ishgard] The Forgotten Knight" },
{ EAetheryteLocation.IshgardSkysteelManufactory, "[Ishgard] Skysteel Manufactory" }, { EAetheryteLocation.IshgardSkysteelManufactory, "[Ishgard] Skysteel Manufactory" },

View File

@ -50,8 +50,8 @@
"Outer La Noscea - Camp Overlook", "Outer La Noscea - Camp Overlook",
"Coerthas Central Highlands - Camp Dragonhead", "Coerthas Central Highlands - Camp Dragonhead",
"Mor Dhona", "Mor Dhona",
"Gold Saucer",
"Wolves' Den Pier", "Wolves' Den Pier",
"Gold Saucer",
"Ishgard", "Ishgard",
"Idyllshire", "Idyllshire",
"Coerthas Western Highlands - Falcon's Nest", "Coerthas Western Highlands - Falcon's Nest",
@ -171,6 +171,14 @@
"[Limsa Lominsa] Zephyr Gate (Middle La Noscea)", "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)",
"[Limsa Lominsa] Tempest Gate (Lower La Noscea)", "[Limsa Lominsa] Tempest Gate (Lower La Noscea)",
"[Limsa Lominsa] Airship Landing", "[Limsa Lominsa] Airship Landing",
"[Gold Saucer] Aetheryte Plaza",
"[Gold Saucer] Entrance & Card Squares",
"[Gold Saucer] Wonder Square East",
"[Gold Saucer] Wonder Square West",
"[Gold Saucer] Event Square",
"[Gold Saucer] Cactpot Board",
"[Gold Saucer] Round Square",
"[Gold Saucer] Chocobo Square",
"[Ishgard] Aetheryte Plaza", "[Ishgard] Aetheryte Plaza",
"[Ishgard] The Forgotten Knight", "[Ishgard] The Forgotten Knight",
"[Ishgard] Skysteel Manufactory", "[Ishgard] Skysteel Manufactory",