summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorDastgir <dastgir@users.noreply.github.com>2016-01-05 14:58:53 +0530
committerDastgir <dastgir@users.noreply.github.com>2016-01-05 14:58:53 +0530
commita2ec42b24a0cfb13c02f85eebbe70789b34fd0b8 (patch)
treeacb76166b3de40a21b30805e15d03c54136128a7 /src/map
parentbe1b586835d509591e9600f6f401c3340d0b28be (diff)
parent54e56b12734ec868b201e22f78624bc3e23bea7e (diff)
downloadhercules-a2ec42b24a0cfb13c02f85eebbe70789b34fd0b8.tar.gz
hercules-a2ec42b24a0cfb13c02f85eebbe70789b34fd0b8.tar.bz2
hercules-a2ec42b24a0cfb13c02f85eebbe70789b34fd0b8.tar.xz
hercules-a2ec42b24a0cfb13c02f85eebbe70789b34fd0b8.zip
Merge pull request #1053 from Jedzkie/Transformation_Scrolls_Update
Monster Transform Update:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c2
-rw-r--r--src/map/status.c2
-rw-r--r--src/map/status.h8
3 files changed, 5 insertions, 7 deletions
diff --git a/src/map/script.c b/src/map/script.c
index c48758db3..3fa0f1fd8 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -18945,8 +18945,6 @@ BUILDIN(montransform) {
return true;
}
- sprintf(msg, msg_sd(sd,1485), monster->name); // Traaaansformation-!! %s form!!
- clif->ShowScript(&sd->bl, msg);
status_change_end(bl, SC_MONSTER_TRANSFORM, INVALID_TIMER); // Clear previous
sc_start2(NULL, bl, SC_MONSTER_TRANSFORM, 100, mob_id, type, tick);
diff --git a/src/map/status.c b/src/map/status.c
index 39329d5bb..d88d163f0 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4952,7 +4952,7 @@ unsigned short status_calc_matk(struct block_list *bl, struct status_change *sc,
if (sc->data[SC_MOONLIT_SERENADE])
matk += matk * sc->data[SC_MOONLIT_SERENADE]->val2 / 100;
if (sc->data[SC_MTF_MATK])
- matk += matk * sc->data[SC_MTF_MATK]->val1 / 100;
+ matk += sc->data[SC_MTF_MATK]->val1;
if (sc->data[SC_MYSTICSCROLL])
matk += matk * sc->data[SC_MYSTICSCROLL]->val1 / 100;
diff --git a/src/map/status.h b/src/map/status.h
index 5996e8c2e..90b05c71c 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1641,10 +1641,10 @@ enum si_type {
//SI_CHUSEOK_WEEKEND = 790,
//SI_ALL_LIGHTGUARD = 791,
//SI_ALL_LIGHTGUARD_COOL_TIME = 792,
- //SI_MTF_MHP = 793,
- //SI_MTF_MSP = 794,
- //SI_MTF_PUMPKIN = 795,
- //SI_MTF_HITFLEE = 796,
+ SI_MTF_MHP = 793,
+ SI_MTF_MSP = 794,
+ SI_MTF_PUMPKIN = 795,
+ SI_MTF_HITFLEE = 796,
//SI_MTF_CRIDAMAGE2 = 797,
//SI_MTF_SPDRAIN = 798,
//SI_ACUO_MINT_GUM = 799,