Tweak distribution for quest generation; block event Hidell Catacombs from being considered for generation. Improve rewards for boss hunt quests while reducing their count.

Author: RyanYappert

Arrowgene.Ddon.GameServer/Handler/QuestGetPartyQuestProgressInfoHandler.cs

@@ -64,13 +64,6 @@ public override S2CQuestGetPartyQuestProgressInfoRes Handle(GameClient client, C
 
                 var questOrder = quest.ToCDataQuestOrderList(questState.Step);
 
-                //if (quest.BackingObject is LightQuestHuntQuest lightBackingObject 
-                //    && questOrder.QuestProcessStateList.FirstOrDefault()?.WorkList.ElementAtOrDefault(0) != null)
-                //{
-                //    var huntRecord = questState.HuntRecords.Values.FirstOrDefault();
-                //    questOrder.QuestProcessStateList.FirstOrDefault().WorkList[0] = lightBackingObject.StepAsWork((huntRecord?.AmountHunted ?? 0) + 1);
-                //}
-
                 pcap.QuestOrderList.Add(questOrder);
             }
 

Arrowgene.Ddon.GameServer/Quests/GenericQuest.cs

@@ -272,10 +272,10 @@ public override List<CDataQuestProcessState> StateMachineExecute(DdonGameServer
 
             foreach (var item in questBlock.ConsumePlayerItems)
             {
-                ItemId itemId = (ItemId) item.ItemId;
+                ItemId itemId = item.ItemId;
                 if (itemId.IsKeyItem())
                 {
-                    var items = client.Character.Storage.GetStorage(StorageType.KeyItems).FindItemsById(item.ItemId);
+                    var items = client.Character.Storage.GetStorage(StorageType.KeyItems).FindItemsById((uint)item.ItemId);
                     if (items.Count == 0)
                     {
                         Logger.Error(client, $"The quest {QuestId} was expecting the key item '{itemId}' to be present, but it doesn't exist in the players inventory. Skipping.");
@@ -751,15 +751,6 @@ private static CDataQuestProcessState BlockAsCDataQuestProcessState(GenericQuest
                     {
                         // Handles kill x amount of monster type quests
                         checkCommands.Add(QuestManager.CheckCommand.EmDieLight((int)questBlock.TargetEnemy.EnemyId, (int)questBlock.TargetEnemy.Level, (int)questBlock.TargetEnemy.Amount));
-                        //workCommands.Add(
-                        //    new CDataQuestProgressWork()
-                        //    {
-                        //        CommandNo = (uint)QuestNotifyCommand.KilledEnemyLight,
-                        //        Work01 = (int)questBlock.TargetEnemy.EnemyId,
-                        //        Work02 = (int)questBlock.TargetEnemy.Level,
-                        //        Work03 = 0,
-                        //        Work04 = 0,
-                        //    });
                     }
                     break;
                 case QuestBlockType.DeliverItemsLight:

Arrowgene.Ddon.GameServer/Quests/LightQuests/LightQuestAreaSummary.cs

@@ -33,21 +33,21 @@ public void Summarize()
             }
         }
 
-        public (EnemyUIId EnemyId, ushort Level) Roll(HashSet<EnemyUIId> exceptions = null)
+        public LightQuestAreaHuntSummaryRecord Roll(HashSet<EnemyUIId> exceptions = null)
         {
             var enemies = HuntRecords.Values.Where(x => exceptions is null || !exceptions.Contains(x.EnemyUIId)).ToList();
             var weights = enemies.Select(x => x.Weight).ToList();
 
             if (enemies.Count == 0)
             {
                 // Failure; no valid enemies.
-                return (0, 0);
+                return null;
             }
 
             var chosenRecord = Random.Shared.ChooseWeighted(enemies, weights);
             var chosenLevel = chosenRecord.RollLevel();
 
-            return (chosenRecord.EnemyUIId, chosenLevel);
+            return chosenRecord;
         }
 
     }
@@ -63,6 +63,8 @@ public class LightQuestAreaHuntSummaryRecord(EnemyUIId enemyUIId)
         public double MeanLevel { get; set; }
         public double StdLevel { get; set; }
 
+        public double Difficulty { get { return ((double)BossCount) / Count; } }
+
         private List<(ushort Level, bool IsBoss)> EnemyData { get; set; } = [];
 
         public void Summarize()
@@ -95,8 +97,11 @@ public double Weight
 
         public ushort RollLevel()
         {
-            double randNormal = Random.Shared.NextNormal(MeanLevel, StdLevel);
-            ushort chosenLevel = (ushort)Math.Round(Math.Clamp(randNormal, ExtantLevels.Min(), ExtantLevels.Max()));
+            uint minLevel = ExtantLevels.Min();
+            double p = 1.0 / (1 + MeanLevel - minLevel);
+            long randGeo = Random.Shared.NextGeometric(p) + minLevel;
+            //double randNormal = Random.Shared.NextNormal(MeanLevel, StdLevel);
+            ushort chosenLevel = (ushort)Math.Clamp(randGeo, ExtantLevels.Min(), ExtantLevels.Max());
             if (!ExtantLevels.Contains(chosenLevel))
             {
                 // Round down to the next lowest extant level

Arrowgene.Ddon.GameServer/Quests/LightQuests/LightQuestManager.cs

@@ -132,16 +132,16 @@ private LightQuestRecord RollHuntQuest(LightQuestInfo quest, LightQuestGeneratin
             int attempt = 0;
             while (attempt < GENERATOR_ATTEMPTS_PER_QUEST)
             {
-                List<(EnemyUIId, ushort)> biasRolls = [];
+                List<(LightQuestAreaHuntSummaryRecord Record, ushort Level)> biasRolls = [];
                 for (int biasRoll = 0; biasRoll <= generatingAsset.BiasRerolls; biasRoll++)
                 {
-                    var (rollEnemy, rollLevel) = summary.Roll(rolledEnemyIds);
-                    if (rollEnemy == 0)
+                    var rollRecord = summary.Roll(rolledEnemyIds);
+                    if (rollRecord is null)
                     {
                         Logger.Error($"Error in generator {generatingAsset.Name}; no valid enemies for region.");
                         break;
                     }
-                    biasRolls.Add((rollEnemy, rollLevel));
+                    biasRolls.Add((rollRecord, rollRecord.RollLevel()));
                 }
 
                 if (biasRolls.Count == 0)
@@ -153,19 +153,23 @@ private LightQuestRecord RollHuntQuest(LightQuestInfo quest, LightQuestGeneratin
 
                 if (generatingAsset.BiasLower)
                 {
-                    biasRolls = biasRolls.OrderBy(x => x.Item2).ToList();
+                    biasRolls = [.. biasRolls.OrderBy(x => x.Level)];
                 }
                 else
                 {
-                    biasRolls = biasRolls.OrderByDescending(x => x.Item2).ToList();
+                    biasRolls = [.. biasRolls.OrderByDescending(x => x.Level)];
                 }
 
-                var chosenRoll = biasRolls.First();
+                var (chosenRecord, chosenLevel) = biasRolls.First();
 
-                if (generatingAsset.MinLevel <= chosenRoll.Item2 && chosenRoll.Item2 <= generatingAsset.MaxLevel)
+                if (generatingAsset.MinLevel <= chosenLevel && chosenLevel <= generatingAsset.MaxLevel)
                 {
                     var mixin = Server.ScriptManager.MixinModule.Get<ILightQuestRewardMixin>("light_hunt_quest_reward");
-                    finalRecord = FinalizeRecord(quest, generatingAsset, (int)chosenRoll.Item1, chosenRoll.Item2, mixin); 
+                    finalRecord = FinalizeRecord(quest, generatingAsset, (int)chosenRecord.EnemyUIId, chosenLevel, mixin, chosenRecord.Difficulty);
+
+                    // Adjustment of count for boss hunts; applies after the rewards are counted.
+                    finalRecord.Count = (int)Math.Pow(finalRecord.Count, 1.0 / (1 + chosenRecord.Difficulty));
+
                     break;
                 }
 
@@ -233,7 +237,7 @@ private LightQuestRecord RollDeliveryQuest(LightQuestInfo quest, LightQuestGener
             return finalRecord;
         }
 
-        private LightQuestRecord FinalizeRecord(LightQuestInfo quest, LightQuestGeneratingAsset generatingAsset, int target, ushort level, ILightQuestRewardMixin mixin)
+        private LightQuestRecord FinalizeRecord(LightQuestInfo quest, LightQuestGeneratingAsset generatingAsset, int target, ushort level, ILightQuestRewardMixin mixin, double difficulty = 0.0)
         {
             var finalRecord = new LightQuestRecord()
             {
@@ -246,10 +250,10 @@ private LightQuestRecord FinalizeRecord(LightQuestInfo quest, LightQuestGenerati
                 DistributionEnd = DateTimeOffset.UtcNow + BOARD_QUEST_DURATION
             };
 
-            finalRecord.RewardG = mixin.CalculateRewardG(finalRecord);
-            finalRecord.RewardR = mixin.CalculateRewardR(finalRecord);
-            finalRecord.RewardXP = mixin.CalculateRewardXP(finalRecord);
-            finalRecord.RewardAP = mixin.CalculateRewardAP(finalRecord);
+            finalRecord.RewardG = mixin.CalculateRewardG(finalRecord, difficulty);
+            finalRecord.RewardR = mixin.CalculateRewardR(finalRecord, difficulty);
+            finalRecord.RewardXP = mixin.CalculateRewardXP(finalRecord, difficulty);
+            finalRecord.RewardAP = mixin.CalculateRewardAP(finalRecord, difficulty);
 
             string targetString = quest.Type == LightQuestType.Hunt ? ((EnemyUIId)target).ToString() : ((ItemId)target).ToString();
 
@@ -587,7 +591,8 @@ private void HandleEnemy(Enemy enemy, LightQuestAreaHuntSummary huntSummary, Lig
             Stage.GardnoxWastewaterTunnel,
             Stage.PitofScreams,
             Stage.MysteriousMausoleum,
-            Stage.SecretProvingGround
+            Stage.SecretProvingGround,
+            Stage.HidellCatacombs1
         }.Select(x => x.StageId).ToHashSet();
 
         private static readonly HashSet<ItemSubCategory> DeliverableSubCategories =

Arrowgene.Ddon.GameServer/Utils/RandomExtensions.cs

@@ -69,6 +69,25 @@ public static double NextNormal(this Random rnd, double mean, double std)
             return mean + std * randStdNormal; //random normal(mean,stdDev^2)
         }
 
+        /// <summary>
+        /// Random geometric variates.
+        /// </summary>
+        /// <param name="rnd"></param>
+        /// <param name="p"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentException"></exception>
+        public static int NextGeometric(this Random rnd, double p)
+        {
+            if (p <= 0 || p > 1)
+            {
+                throw new ArgumentException("Invalid probability for geometric distribution. (0 < p <= 1)");
+            }
+            double u = rnd.NextDouble();
+            double lnu = Math.Log(u);
+            double lnp = Math.Log(1 - p);
+            return (int)Math.Floor(lnu / lnp);
+        }
+
         /// <summary>
         /// Choose from a list of objects according to their weights.
         /// </summary>

Arrowgene.Ddon.Scripts/scripts/mixins/light_hunt_quest_reward.csx

@@ -15,7 +15,7 @@ public class Mixin : ILightQuestRewardMixin
         // More generous at most levels, less generous at the jumps.
         double baseXP = 1.150 * Math.Pow(level, 2.0) + 100;
 
-        double difficultyFactor = difficulty * 7.0 + 1.0;
+        double difficultyFactor = difficulty * 9.0 + 1.0;
 
         return (uint)(baseXP * adjustedCount * difficultyFactor);
     }