diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-11-08 02:57:43 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-11-08 02:57:43 +0000 |
| commit | f1b7e9e345ce8db6a0287252a9ef97fb7894c9b6 (patch) | |
| tree | 38ac0ee2fe25f536f65cab469a3da9bacb47286f /src | |
| parent | 6b1fa57c42b1265626eece004b527b99dd0834f7 (diff) | |
| parent | 7ba51de96d337fa4f00983ca5c018b9fee780f49 (diff) | |
| download | tmwa-f1b7e9e345ce8db6a0287252a9ef97fb7894c9b6.tar.gz tmwa-f1b7e9e345ce8db6a0287252a9ef97fb7894c9b6.tar.bz2 tmwa-f1b7e9e345ce8db6a0287252a9ef97fb7894c9b6.tar.xz tmwa-f1b7e9e345ce8db6a0287252a9ef97fb7894c9b6.zip | |
Merge branch 'matkpot' into 'master'
SC_MATKPOT
See merge request legacy/tmwa!251
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/pc.cpp | 12 |
1 files 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; |