Merge pull request #837 from pacampbell/fix_pawn_s2_stats_again

fix: Fix issue with pawn extended stats

Author: pacampbell

Arrowgene.Ddon.GameServer/GameStructure.cs

@@ -152,7 +152,7 @@ public static void CDataPawnInfo(CDataPawnInfo cDataPawnInfo, Pawn pawn)
             .ToList();
         // TODO: AbilityCostMax, ExtendParam
         cDataPawnInfo.AbilityCostMax = 15;
-        cDataPawnInfo.ExtendParam = pawn.ExtendedParams;
+        cDataPawnInfo.ExtendParam = pawn.CalculateFullExtendedParams(); // pawn.ExtendedParams;
         cDataPawnInfo.PawnType = pawn.PawnType;
         // TODO: ShareRange, Likability, Unk1
         cDataPawnInfo.ShareRange = 1;

Arrowgene.Ddon.GameServer/Handler/OrbDevoteGetOrbGainExtendParamHandler.cs

@@ -20,22 +20,9 @@ public OrbDevoteGetOrbGainExtendParamHandler(DdonGameServer server) : base(serve
         public override void Handle(GameClient client, IPacket packet)
         {
             // client.Send(InGameDump.Dump_50);
-            S2COrbDevoteGetOrbGainExtendParamRes Result = new S2COrbDevoteGetOrbGainExtendParamRes();
-            Result.ExtendParam = new CDataOrbGainExtendParam()
+            S2COrbDevoteGetOrbGainExtendParamRes Result = new S2COrbDevoteGetOrbGainExtendParamRes()
             {
-                HpMax = (ushort) client.Character.StatusInfo.GainHP,
-                StaminaMax = (ushort)client.Character.StatusInfo.GainStamina,
-                Attack = (ushort)client.Character.StatusInfo.GainAttack,
-                Defence = (ushort)client.Character.StatusInfo.GainDefense,
-                MagicAttack = (ushort)client.Character.StatusInfo.GainMagicAttack,
-                MagicDefence = (ushort)client.Character.StatusInfo.GainMagicDefense,
-                AbilityCost = client.Character.ExtendedParams.AbilityCost,
-                JewelrySlot = client.Character.ExtendedParams.JewelrySlot,
-                UseItemSlot = client.Character.ExtendedParams.UseItemSlot,
-                MaterialItemSlot = client.Character.ExtendedParams.MaterialItemSlot,
-                EquipItemSlot = client.Character.ExtendedParams.EquipItemSlot,
-                MainPawnSlot = client.Character.ExtendedParams.MainPawnSlot,
-                SupportPawnSlot = client.Character.ExtendedParams.SupportPawnSlot
+                ExtendParam = client.Character.CalculateFullExtendedParams()
             };
             client.Send(Result);
         }

Arrowgene.Ddon.GameServer/Handler/PawnGetMypawnDataHandler.cs

@@ -49,7 +49,8 @@ public override S2CPawnGetMyPawnDataRes Handle(GameClient client, C2SPawnGetMyPa
             {
                 CharacterId = client.Character.CharacterId,
                 PawnId = pawn.PawnId,
-                OrbPageStatusList = _OrbUnlockManager.GetOrbPageStatus(pawn)
+                OrbPageStatusList = _OrbUnlockManager.GetOrbPageStatus(pawn),
+                JobOrbTreeStatusList = Server.JobOrbUnlockManager.GetJobOrbTreeStatus(client.Character)
             };
             client.Send(orbNtc);
 

Arrowgene.Ddon.Shared/Model/CharacterCommon.cs

@@ -74,5 +74,25 @@ public CDataCharacterJobData? ActiveCharacterJobData
 
         public uint GreenHp {  get; set; }
         public uint WhiteHp { get; set; }
+
+        public CDataOrbGainExtendParam CalculateFullExtendedParams()
+        {
+            return new CDataOrbGainExtendParam()
+            {
+                HpMax = (ushort) StatusInfo.GainHP,
+                StaminaMax = (ushort) StatusInfo.GainStamina,
+                Attack = (ushort) StatusInfo.GainAttack,
+                Defence = (ushort) StatusInfo.GainDefense,
+                MagicAttack = (ushort) StatusInfo.GainMagicAttack,
+                MagicDefence = (ushort) StatusInfo.GainMagicDefense,
+                AbilityCost = ExtendedParams.AbilityCost,
+                JewelrySlot = ExtendedParams.JewelrySlot,
+                UseItemSlot = ExtendedParams.UseItemSlot,
+                MaterialItemSlot = ExtendedParams.MaterialItemSlot,
+                EquipItemSlot = ExtendedParams.EquipItemSlot,
+                MainPawnSlot = ExtendedParams.MainPawnSlot,
+                SupportPawnSlot = ExtendedParams.SupportPawnSlot
+            };
+        }
     }
 }