Mevasion, Maccuracy, Mcrit values

shnok · Jul 12, 2024 · d43d5ae · d43d5ae
1 parent 22beb35
commit d43d5ae
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta b/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta
diff --git a/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta b/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta
diff --git a/l2-unity/Assets/Scripts/Game/Manager/WorldCombat.cs b/l2-unity/Assets/Scripts/Game/Manager/WorldCombat.cs
@@ -128,14 +128,23 @@ public void StatusUpdate(Entity entity, List<Attribute> attributes) {
                 case AttributeType.P_DEF:
                     ((PlayerStats) stats).PDef = attribute.value;
                     break;
-                case AttributeType.EVASION:
-                    ((PlayerStats) stats).PEvasion = attribute.value;
+                case AttributeType.P_EVASION:
+                    ((PlayerStats)stats).PEvasion = attribute.value;
                     break;
-                case AttributeType.ACCURACY:
-                    ((PlayerStats) stats).PAccuracy = attribute.value;
+                case AttributeType.P_ACCURACY:
+                    ((PlayerStats)stats).PAccuracy = attribute.value;
                     break;
-                case AttributeType.CRITICAL:
-                    ((PlayerStats) stats).PCritical = attribute.value;
+                case AttributeType.P_CRITICAL:
+                    ((PlayerStats)stats).PCritical = attribute.value;
+                    break;
+                case AttributeType.M_EVASION:
+                    ((PlayerStats)stats).MEvasion = attribute.value;
+                    break;
+                case AttributeType.M_ACCURACY:
+                    ((PlayerStats)stats).MAccuracy = attribute.value;
+                    break;
+                case AttributeType.M_CRITICAL:
+                    ((PlayerStats)stats).MCritical = attribute.value;
                     break;
                 case AttributeType.M_ATK:
                     ((PlayerStats) stats).MAtk = attribute.value;

diff --git a/...sets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/PlayerInfoPacket.cs b/...sets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/PlayerInfoPacket.cs
@@ -50,7 +50,10 @@ public override void Parse() {
             _info.Stats.PDef = ReadI();
             _info.Stats.PEvasion = ReadI();
             _info.Stats.PAccuracy = ReadI();
+            _info.Stats.MEvasion = ReadI();
+            _info.Stats.MAccuracy = ReadI();
             _info.Stats.PCritical = ReadI();
+            _info.Stats.MCritical = ReadI();
             _info.Stats.MAtk = ReadI();
             _info.Stats.MDef = ReadI();
             // Stats

diff --git a/...ts/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/StatusUpdatePacket.cs b/...ts/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/StatusUpdatePacket.cs
@@ -26,14 +26,17 @@ public enum AttributeType : byte {
         P_ATK = 0x11,
         ATK_SPD = 0x12,
         P_DEF = 0x13,
-        EVASION = 0x14,
-        ACCURACY = 0x15,
-        CRITICAL = 0x16,
+        P_EVASION = 0x14,
+        P_ACCURACY = 0x15,
+        P_CRITICAL = 0x16,
         M_ATK = 0x17,
         CAST_SPD = 0x18,
         M_DEF = 0x19,
         PVP_FLAG = 0x1a,
         KARMA = 0x1b,
+        M_ACCURACY = 0x1C,
+        M_EVASION = 0x1D,
+        M_CRITICAL = 0x1E,
 
         CUR_CP = 0x21,
         MAX_CP = 0x22

diff --git a/l2-unity/Assets/Scripts/UI/Game/CharacterWindow.cs b/l2-unity/Assets/Scripts/UI/Game/CharacterWindow.cs
@@ -6,9 +6,6 @@
 
 public class CharacterInfoWindow : L2PopupWindow
 {
-    public VisualElement minimal_panel;
-    private VisualElement content;
-
     // player
     private Label _nameLabel;
     private Label _levelLabel;