From 5954bf53cac41cac2fd1eb3bb3d91783f0f9644e Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Wed, 23 Dec 2015 14:10:12 +0800 Subject: Item Update: - Remove the hard coded entry of Monster Transform Scrolls - Change mob names into mob constants. --- db/re/item_db.conf | 30 +++++++++++++++--------------- src/map/battle.c | 4 ++-- src/map/status.c | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 1f8e54a9c..c63e71bc5 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -76469,8 +76469,8 @@ item_db: ( Type: 0 Weight: 30 Script: <" - itemheal rand(45,65),0; - montransform "Bloody Murderer",600000,SC_MTF_MHP,1000; + itemheal rand(45,65), 0; + montransform BLOODY_MURDERER, 600000, SC_MTF_MHP, 1000; "> }, { @@ -76480,8 +76480,8 @@ item_db: ( Type: 0 Weight: 30 Script: <" - itemheal rand(45,65),0; - montransform "Bathory",600000,SC_MTF_MSP,100; + itemheal rand(45,65), 0; + montransform BATHORY, 600000, SC_MTF_MSP, 100; "> }, { @@ -76492,7 +76492,7 @@ item_db: ( Weight: 30 Script: <" itemheal rand(45,65),0; - montransform "Jakk",600000,SC_MTF_PUMPKIN,2000; + montransform JAKK, 600000, SC_MTF_PUMPKIN, 2000; "> }, { @@ -76503,7 +76503,7 @@ item_db: ( Weight: 30 Script: <" itemheal rand(45,65),0; - montransform "Quve",600000,SC_MTF_HITFLEE,10,20; + montransform QUVE, 600000, SC_MTF_HITFLEE, 10, 20; "> }, { @@ -85192,7 +85192,7 @@ item_db: ( nomail: true noauction: true } - Script: <" montransform "Deviruchi",1200000,SC_MTF_ASPD; "> + Script: <" montransform DEVIRUCHI, 1200000, SC_MTF_ASPD, 10, 5; "> }, { Id: 12659 @@ -85210,7 +85210,7 @@ item_db: ( nomail: true noauction: true } - Script: <" montransform "Raydric Archer",1200000,SC_MTF_RANGEATK; "> + Script: <" montransform RAYDRIC_ARCHER, 1200000, SC_MTF_RANGEATK, 25; "> }, { Id: 12660 @@ -85228,7 +85228,7 @@ item_db: ( nomail: true noauction: true } - Script: <" montransform "Mavka",1200000,SC_MTF_RANGEATK; "> + Script: <" montransform MAVKA, 1200000, SC_MTF_RANGEATK, 25; "> }, { Id: 12661 @@ -85246,7 +85246,7 @@ item_db: ( nomail: true noauction: true } - Script: <" montransform "Marduk",1200000,SC_MTF_MATK; "> + Script: <" montransform MARDUK, 1200000, SC_MTF_MATK, 25; "> }, { Id: 12662 @@ -85264,7 +85264,7 @@ item_db: ( nomail: true noauction: true } - Script: <" montransform "Banshee",1200000,SC_MTF_MATK; "> + Script: <" montransform BANSHEE, 1200000, SC_MTF_MATK, 25; "> }, { Id: 12663 @@ -85282,7 +85282,7 @@ item_db: ( nomail: true noauction: true } - Script: <" montransform "Poring",1200000,SC_MTF_CRIDAMAGE; "> + Script: <" montransform PORING, 1200000, SC_MTF_CRIDAMAGE, 5; "> }, { Id: 12664 @@ -85300,7 +85300,7 @@ item_db: ( nomail: true noauction: true } - Script: <" montransform "Golem",1200000,SC_MTF_MLEATKED; "> + Script: <" montransform GOLEM, 1200000, SC_MTF_MLEATKED, 2; "> }, { Id: 12665 @@ -135207,8 +135207,8 @@ item_db: ( Loc: 64 Script: <" skill ALL_CATCRY, 1; - bonus bUnbreakableShoes,0; - autobonus3 "{ }",1000,7000,ALL_CATCRY,"{ montransform 1505,420000; }"; + bonus bUnbreakableShoes, 1; + autobonus3 "{ }", 1000, 7000, ALL_CATCRY, "{ montransform LOLI_RURI, 420000; }"; "> }, diff --git a/src/map/battle.c b/src/map/battle.c index b19e13438..88037b042 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4905,7 +4905,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list if(flag.cri && sd->bonus.crit_atk_rate) ATK_ADDRATE(sd->bonus.crit_atk_rate); if(flag.cri && sc && sc->data[SC_MTF_CRIDAMAGE]) - ATK_ADDRATE(25);// temporary it should be 'bonus.crit_atk_rate' + ATK_ADDRATE(sc->data[SC_MTF_CRIDAMAGE]->val1);// temporary it should be 'bonus.crit_atk_rate' #ifndef RENEWAL if(sd->status.party_id && (temp=pc->checkskill(sd,TK_POWER)) > 0){ @@ -5218,7 +5218,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list if( wd.flag&BF_LONG ) ATK_ADDRATE(sd->bonus.long_attack_atk_rate); if( sc && sc->data[SC_MTF_RANGEATK] ) - ATK_ADDRATE(25);// temporary it should be 'bonus.long_attack_atk_rate' + ATK_ADDRATE(sc->data[SC_MTF_RANGEATK]->val1);// temporary it should be 'bonus.long_attack_atk_rate' #endif if( (i=pc->checkskill(sd,AB_EUCHARISTICA)) > 0 && (tstatus->race == RC_DEMON || tstatus->def_ele == ELE_DARK) ) diff --git a/src/map/status.c b/src/map/status.c index 039315659..9348307b3 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3074,7 +3074,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) { sd->subele[ELE_FIRE] -= i; } if (sc->data[SC_MTF_MLEATKED]) - sd->subele[ELE_NEUTRAL] += 2; + sd->subele[ELE_NEUTRAL] += sc->data[SC_MTF_MLEATKED]->val1; if (sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 3) sd->magic_addele[ELE_FIRE] += 25; if (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 3) @@ -4932,7 +4932,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 * 25 / 100; + matk += matk * sc->data[SC_MTF_MATK]->val1 / 100; if (sc->data[SC_MYSTICSCROLL]) matk += matk * sc->data[SC_MYSTICSCROLL]->val1 / 100; @@ -5008,7 +5008,7 @@ signed short status_calc_hit(struct block_list *bl, struct status_change *sc, in if (!viewable) { /* some statuses that are hidden in the status window */ if (sc->data[SC_MTF_ASPD]) - hit += 5; + hit += sc->data[SC_MTF_ASPD]->val2; return (short)cap_value(hit, 1, SHRT_MAX); } @@ -5780,7 +5780,7 @@ short status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, int if (sc->data[SC_FIGHTINGSPIRIT] && sc->data[SC_FIGHTINGSPIRIT]->val2) aspd -= (bl->type==BL_PC?pc->checkskill((TBL_PC *)bl, RK_RUNEMASTERY):10) / 10 * 40; if (sc->data[SC_MTF_ASPD]) - aspd -= 10; + aspd -= sc->data[SC_MTF_ASPD]->val1; if (sc->data[SC_OVERED_BOOST]) // should be final and unmodifiable by any means aspd = (200 - sc->data[SC_OVERED_BOOST]->val3) * 10; -- cgit v1.2.3-70-g09d2