From 96069b1d7831ad2dec6c623dc80a14aaa8a85b53 Mon Sep 17 00:00:00 2001
From: Chomp <jr@spt.com>
Date: Fri, 29 Dec 2023 17:34:45 +0000
Subject: [PATCH] Update mappings

---
 QuestValidator.Common/Helpers/QuestNames.cs        |  2 ++
 QuestValidator.Common/Helpers/QuestRequirements.cs | 11 ++++++++---
 QuestValidator.Common/Models/Quest.cs              |  3 ++-
 QuestValidator.Models/Input/Quest.cs               |  3 +++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/QuestValidator.Common/Helpers/QuestNames.cs b/QuestValidator.Common/Helpers/QuestNames.cs
index 4e240d5..da27074 100644
--- a/QuestValidator.Common/Helpers/QuestNames.cs
+++ b/QuestValidator.Common/Helpers/QuestNames.cs
@@ -388,6 +388,7 @@ namespace QuestValidator.Common.Helpers
             { Quest.SavingTheMole, "657315e4a6af4ab4b50f3459"},
             { Quest.DevelopersSecretsP1, "65733403eefc2c312a759ddb" },
             { Quest.DevelopersSecretsP2, "6573382e557ff128bf3da536" },
+            { Quest.LuxuriousLife, "657315e1dccd301f1301416a"}
         };
 
         private static readonly Dictionary<string, string> questNames = new Dictionary<string, string>
@@ -775,6 +776,7 @@ namespace QuestValidator.Common.Helpers
             { "657315e4a6af4ab4b50f3459", "Saving The Mole"},
             { "65733403eefc2c312a759ddb", "Developers Secrets P1" },
             { "6573382e557ff128bf3da536", "Developers Secrets P2" },
+            { "657315e1dccd301f1301416a", "Luxurious Life"}
         };
         public static string GetNameById(string id)
         {
diff --git a/QuestValidator.Common/Helpers/QuestRequirements.cs b/QuestValidator.Common/Helpers/QuestRequirements.cs
index f552289..889f633 100644
--- a/QuestValidator.Common/Helpers/QuestRequirements.cs
+++ b/QuestValidator.Common/Helpers/QuestRequirements.cs
@@ -55,7 +55,10 @@ namespace QuestValidator.Common.Helpers
 
         private static readonly Dictionary<Quest, QuestData> questWithPreceedingQuestDict = new Dictionary<Quest, QuestData>
         {
-            { Quest.Debut, GetQuestData(Quest.Debut)},
+            { Quest.Debut, GetQuestData(Quest.Debut)
+                .AddPrerequisiteQuest(Quest.ShootingCans, QuestStatus.Success)},
+            { Quest.LuxuriousLife, GetQuestData(Quest.Debut)
+                .AddPrerequisiteQuest(Quest.Debut, QuestStatus.Success)},
             { Quest.Checking, GetQuestData(Quest.Checking)
                 .AddPrerequisiteQuest(Quest.Debut, QuestStatus.Success)},
             { Quest.ShootoutPicnic, GetQuestData(Quest.ShootoutPicnic)
@@ -72,7 +75,8 @@ namespace QuestValidator.Common.Helpers
                 .AddPrerequisiteQuest(Quest.PostmanPatP1, QuestStatus.StartedSuccess)},
             { Quest.ShakingUpTeller, GetQuestData(Quest.ShakingUpTeller)
                 .AddPrerequisiteQuest(Quest.IceCreamCones, QuestStatus.Success)},
-            { Quest.Shortage, GetQuestData(Quest.Shortage)},
+            { Quest.Shortage, GetQuestData(Quest.Shortage)
+                .AddPrerequisiteQuest(Quest.FirstInLine, QuestStatus.Success)},
             { Quest.SanitaryStandardsP1, GetQuestData(Quest.SanitaryStandardsP1)
                 .AddPrerequisiteQuest(Quest.Shortage, QuestStatus.Success)},
             { Quest.OperationAquarius, GetQuestData(Quest.OperationAquarius)
@@ -93,7 +97,8 @@ namespace QuestValidator.Common.Helpers
                 .AddPrerequisiteQuest(Quest.SanitaryStandardsP1, QuestStatus.Success)},
             { Quest.CarRepair, GetQuestData(Quest.CarRepair)
                 .AddPrerequisiteQuest(Quest.Pharmacist, QuestStatus.Success)},
-            { Quest.Supplier, GetQuestData(Quest.Supplier)},
+            { Quest.Supplier, GetQuestData(Quest.Supplier)
+                .AddPrerequisiteQuest(Quest.BurningRubber, QuestStatus.Success)},
             { Quest.TheExtortionist, GetQuestData(Quest.TheExtortionist)
                 .AddPrerequisiteQuest(Quest.Supplier, QuestStatus.Success)},
             { Quest.Stirrup, GetQuestData(Quest.Stirrup)
diff --git a/QuestValidator.Common/Models/Quest.cs b/QuestValidator.Common/Models/Quest.cs
index 1891d7c..1b76cc6 100644
--- a/QuestValidator.Common/Models/Quest.cs
+++ b/QuestValidator.Common/Models/Quest.cs
@@ -384,6 +384,7 @@
         BurningRubber = 379,
         SavingTheMole = 380,
         DevelopersSecretsP1 = 381,
-        DevelopersSecretsP2 = 382
+        DevelopersSecretsP2 = 382,
+        LuxuriousLife = 383
     }
 }
diff --git a/QuestValidator.Models/Input/Quest.cs b/QuestValidator.Models/Input/Quest.cs
index 3821071..bf7d162 100644
--- a/QuestValidator.Models/Input/Quest.cs
+++ b/QuestValidator.Models/Input/Quest.cs
@@ -20,6 +20,7 @@ namespace QuestValidator.Models
         public QuestConditions conditions { get; set; }
         public string description { get;set;}
         public string failMessageText { get; set; }
+        public string declinePlayerMessage { get; set; }
         public string name { get; set; }
         public string note { get; set; }
         public object? questStatus { get;set; }
@@ -53,6 +54,7 @@ namespace QuestValidator.Models
 
     public class AvailableFor
     {
+        public int? completeInSeconds { get; set; }
         public string conditionType { get; set; }
         public Counter counter { get; set; }
         public object dogtagLevel { get; set; }
@@ -74,6 +76,7 @@ namespace QuestValidator.Models
         public object status { get; set; }
         public bool? unknown { get; set; }
         public bool? doNotResetIfCounterCompleted { get; set; }
+        public string globalQuestCounterId { get; set; }
         public object value { get; set; }
         public int? availableAfter { get; set; }
         public int? dispersion { get; set; }