From 7ba51de96d337fa4f00983ca5c018b9fee780f49 Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Wed, 8 Nov 2023 02:57:42 +0000
Subject: SC_MATKPOT
---
src/map/pc.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index d496c5f..ea15910 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -1378,6 +1378,13 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first)
sd->base_atk += str + dstr * dstr + dex / 5 + sd->paramc[ATTR::LUK] / 5;
sd->matk1 += sd->paramc[ATTR::INT] + (sd->paramc[ATTR::INT] / 5) * (sd->paramc[ATTR::INT] / 5);
sd->matk2 += sd->paramc[ATTR::INT] + (sd->paramc[ATTR::INT] / 7) * (sd->paramc[ATTR::INT] / 7);
+
+ if (sd->sc_data[StatusChange::SC_MATKPOT].timer)
+ {
+ sd->matk1 += sd->sc_data[StatusChange::SC_MATKPOT].val1;
+ sd->matk2 += sd->sc_data[StatusChange::SC_MATKPOT].val1;
+ }
+
if (sd->matk1 < sd->matk2)
{
int temp = sd->matk2;
@@ -1532,11 +1539,6 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first)
if (sd->sc_data[StatusChange::SC_ATKPOT].timer)
sd->watk += sd->sc_data[StatusChange::SC_ATKPOT].val1;
- if (sd->sc_data[StatusChange::SC_MATKPOT].timer)
- {
- sd->matk1 += sd->sc_data[StatusChange::SC_MATKPOT].val1;
- sd->matk2 += sd->sc_data[StatusChange::SC_MATKPOT].val1;
- }
if (sd->sc_data[StatusChange::SC_SPEEDPOTION0].timer)
aspd_rate -= sd->sc_data[StatusChange::SC_SPEEDPOTION0].val1;
--
cgit v1.2.3-70-g09d2