diff options
| -rw-r--r-- | conf/messages.conf | 3 | ||||
| -rw-r--r-- | db/re/item_db.conf | 15 | ||||
| -rw-r--r-- | src/map/script.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 2 | ||||
| -rw-r--r-- | src/map/status.h | 8 |
5 files changed, 22 insertions, 8 deletions
diff --git a/conf/messages.conf b/conf/messages.conf index d946f2c8b..6be8c7221 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1516,8 +1516,9 @@ //src/map/atcommand.c::ACMD(auction) 1484: Auction is disabled +//1485: FREE + //Monster Transformation -1485: Traaaansformation-!! %s form!! 1486: Cannot transform into monster while in disguise. 1487: Character cannot be disguised while in monster form. 1488: Transforming into monster is not allowed in Guild Wars. diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 8da68cf6a..78ec867f5 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -76574,6 +76574,8 @@ item_db: ( Weight: 30 Script: <" itemheal rand(45,65), 0; + specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Bloody Murderer Fo-rm!!"; montransform BLOODY_MURDERER, 600000, SC_MTF_MHP, 1000; "> }, @@ -76585,6 +76587,8 @@ item_db: ( Weight: 30 Script: <" itemheal rand(45,65), 0; + specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!!! Bathory Fo-rm!!"; montransform BATHORY, 600000, SC_MTF_MSP, 100; "> }, @@ -76596,6 +76600,8 @@ item_db: ( Weight: 30 Script: <" itemheal rand(45,65),0; + specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Jack Fo-rm!!"; montransform JAKK, 600000, SC_MTF_PUMPKIN, 2000; "> }, @@ -76607,6 +76613,8 @@ item_db: ( Weight: 30 Script: <" itemheal rand(45,65),0; + specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Cube Fo-rm!!"; montransform QUVE, 600000, SC_MTF_HITFLEE, 10, 20; "> }, @@ -85101,6 +85109,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Deviling Fo-rm!!"; montransform DEVIRUCHI, 1200000, SC_MTF_ASPD, 10, 5; "> }, @@ -85122,6 +85131,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Raydric Archer Fo-rm!!"; montransform RAYDRIC_ARCHER, 1200000, SC_MTF_RANGEATK, 25; "> }, @@ -85143,6 +85153,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Mavka Fo-rm!!"; montransform MAVKA, 1200000, SC_MTF_RANGEATK, 25; "> }, @@ -85164,6 +85175,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Marduk Fo-rm!!"; montransform MARDUK, 1200000, SC_MTF_MATK, 25; "> }, @@ -85185,6 +85197,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Banshee Fo-rm!!"; montransform BANSHEE, 1200000, SC_MTF_MATK, 25; "> }, @@ -85206,6 +85219,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Poring Fo-rm!!"; montransform PORING, 1200000, SC_MTF_CRIDAMAGE, 5; "> }, @@ -85227,6 +85241,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Golem Fo-rm!!"; montransform GOLEM, 1200000, SC_MTF_MLEATKED, 2; "> }, 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, |