Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed some hardcoded item checks (#2303)

Browse Source 
* Fixes #991.
* Removed hardcoded checks for SC_ITEMBOOST, SC_EXPBOOST, and SC_JEXPBOOST.
* Players are able to still consume these items even if the status is already active.
* Corrected the item bonus for Malangdo Cat Can.
Thanks to @cydh!
This commit is contained in:
Aleos 2017-08-04 19:11:05 -04:00 committed by GitHub
parent bbd42e7f12
commit cd164d74cd
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/re/item_db.txt
View File

@ -6763,7 +6763,7 @@
12630,Teddy_Bear_Scroll,Teddy Bear Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ mercenary_create 2217,1800000; },{},{}
12631,Macro_Stone_A,Macro Stone A,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12632,Macro_Stone_B,Macro Stone B,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12633,Malang_Cat_Can,Malangdo Cat Can,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_MAGICALATTHIT; bonus_script "{ bonus2 bExpAddRace,RC_All,10; }",1200; sc_start SC_ITEMBOOST,1200000,20; },{},{}
12633,Malang_Cat_Can,Malangdo Cat Can,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_MAGICALATTHIT; bonus_script "{ bonus2 bExpAddRace,RC_All,10; bonus2 bDropAddRace,RC_All,20; }",1200,1,0,SI_OVERLAPEXPUP; },{},{}
12634,Macro_Stone_A1,Macro Stone A1,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12635,Macro_Stone_A2,Macro Stone A2,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12636,Malang_Sp_Can,Malangdo Canned Specialties,2,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "malangdo",140,114; },{},{}

10
src/map/itemdb.h
View File

@ -97,34 +97,24 @@ enum item_itemid
ITEMID_CATNIP_FRUIT = 11602,
ITEMID_MERCENARY_RED_POTION = 12184,
ITEMID_MERCENARY_BLUE_POTION = 12185,
ITEMID_BATTLE_MANUAL = 12208,
ITEMID_BUBBLE_GUM = 12210,
ITEMID_GIANT_FLY_WING = 12212,
ITEMID_NEURALIZER = 12213,
ITEMID_M_CENTER_POTION = 12241,
ITEMID_M_AWAKENING_POTION = 12242,
ITEMID_M_BERSERK_POTION = 12243,
ITEMID_COMP_BATTLE_MANUAL = 12263,
ITEMID_THICK_BATTLE_MANUAL = 12312,
ITEMID_N_FLY_WING = 12323,
ITEMID_N_BUTTERFLY_WING = 12324,
ITEMID_NOVICE_MAGNIFIER = 12325,
ITEMID_ANCILLA = 12333,
ITEMID_DUN_TELE_SCROLL3 = 12352,
ITEMID_REINS_OF_MOUNT = 12622,
ITEMID_COMP_BUBBLE_GUM = 12264,
ITEMID_NOBLE_NAMEPLATE = 12705,
ITEMID_DUN_TELE_SCROLL1 = 14527,
ITEMID_BATTLE_MANUAL25 = 14532,
ITEMID_BATTLE_MANUAL100 = 14533,
ITEMID_BATTLE_MANUAL300 = 14545,
ITEMID_DUN_TELE_SCROLL2 = 14581,
ITEMID_WOB_RUNE = 14582,
ITEMID_WOB_SCHWALTZ = 14583,
ITEMID_WOB_RACHEL = 14584,
ITEMID_WOB_LOCAL = 14585,
ITEMID_SIEGE_TELEPORT_SCROLL = 14591,
ITEMID_JOB_MANUAL50 = 14592,
};
///Rune Knight

19
src/map/pc.c
View File

@ -4835,25 +4835,6 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
if( map[sd->bl.m].flag.noreturn && nameid != ITEMID_WING_OF_FLY && nameid != ITEMID_GIANT_FLY_WING && nameid != ITEMID_N_FLY_WING )
return false;
break;
case ITEMID_BUBBLE_GUM:
case ITEMID_COMP_BUBBLE_GUM:
if( sd->sc.data[SC_ITEMBOOST] )
return false;
break;
case ITEMID_BATTLE_MANUAL:
case ITEMID_COMP_BATTLE_MANUAL:
case ITEMID_THICK_BATTLE_MANUAL:
case ITEMID_NOBLE_NAMEPLATE:
case ITEMID_BATTLE_MANUAL25:
case ITEMID_BATTLE_MANUAL100:
case ITEMID_BATTLE_MANUAL300:
if( sd->sc.data[SC_EXPBOOST] )
return false;
break;
case ITEMID_JOB_MANUAL50:
if( sd->sc.data[SC_JEXPBOOST] )
return false;
break;
case ITEMID_MERCENARY_RED_POTION:
case ITEMID_MERCENARY_BLUE_POTION:
case ITEMID_M_CENTER_POTION: