From 5020a123570a7b263f6b742df5891a36434473a0 Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Thu, 31 Dec 2015 20:15:37 +0800 Subject: Removal of Hard coded showscript command for Monster Transform. --- conf/messages.conf | 3 ++- db/re/item_db.conf | 15 +++++++++++++++ src/map/script.c | 2 -- 3 files changed, 17 insertions(+), 3 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 82e9a2aba..8884857bd 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -75299,6 +75299,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; "> }, @@ -75310,6 +75312,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; "> }, @@ -75321,6 +75325,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; "> }, @@ -75332,6 +75338,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; "> }, @@ -83826,6 +83834,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Deviling Fo-rm!!"; montransform DEVIRUCHI, 1200000, SC_MTF_ASPD, 10, 5; "> }, @@ -83847,6 +83856,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Raydric Archer Fo-rm!!"; montransform RAYDRIC_ARCHER, 1200000, SC_MTF_RANGEATK, 25; "> }, @@ -83868,6 +83878,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Mavka Fo-rm!!"; montransform MAVKA, 1200000, SC_MTF_RANGEATK, 25; "> }, @@ -83889,6 +83900,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Marduk Fo-rm!!"; montransform MARDUK, 1200000, SC_MTF_MATK, 25; "> }, @@ -83910,6 +83922,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Banshee Fo-rm!!"; montransform BANSHEE, 1200000, SC_MTF_MATK, 25; "> }, @@ -83931,6 +83944,7 @@ item_db: ( } Script: <" specialeffect2 EF_CLOAKING; + showscript "Trans-Form-!! Poring Fo-rm!!"; montransform PORING, 1200000, SC_MTF_CRIDAMAGE, 5; "> }, @@ -83952,6 +83966,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 591bca68f..26e98a56c 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); -- cgit v1.2.3-60-g2f50 From ada90628a2f377445166e8543b30f8817a6922e7 Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Tue, 5 Jan 2016 14:45:24 +0800 Subject: Enable the Status Icons for Transformation Candies. --- src/map/status.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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, -- cgit v1.2.3-60-g2f50 From 54e56b12734ec868b201e22f78624bc3e23bea7e Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Tue, 5 Jan 2016 14:47:41 +0800 Subject: Corrected the MTF_MATK, it should only give Fix MATK instead of MATK Rate --- src/map/status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3-60-g2f50