diff options
| -rw-r--r-- | db/skill_db.txt | 80 | ||||
| -rw-r--r-- | src/map/mob.c | 8 |
2 files changed, 44 insertions, 44 deletions
diff --git a/db/skill_db.txt b/db/skill_db.txt index 3cacb5267..94c39c255 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -80,7 +80,7 @@ 36,0,0,0,0,0,0,10,0,no,0,0,0,none,0, MC_INCCARRY,Enlarge Weight Limit 37,0,0,0,0,0,0,10,0,no,0,0,0,none,0, MC_DISCOUNT,Discount 38,0,0,0,0,0,0,10,0,no,0,0,0,none,0, MC_OVERCHARGE,Overcharge -39,1,0,0,0,0,0,10,0,no,0,0,0,none,0, MC_VENDING,Pushcart +39,1,0,0,0,0,0,10,0,no,0,0,0,none,0, MC_PUSHCART,Pushcart 40,1,6,4,0,0x1,0,1,1,no,0,0,0,none,0, MC_IDENTIFY,Item Appraisal 41,1,6,4,0,0x1,0,10,1,no,0,0,0,none,0, MC_VENDING,Vending 42,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, MC_MAMMONITE,Mammonite @@ -503,17 +503,17 @@ 459,0,6,4,0,0x3,-1,1,1,no,0,0x8,0,weapon,0 , BS_ADRENALINE2,Advanced Adrenaline Rush 460,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0, SL_HUNTER,Spirit of the Hunter 461,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0, SL_SOULLINKER,Spirit of the Soul Linker -462,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0 , SL_KAIZEL,Kaizel -463,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0 , SL_KAAHI,Kaahi -464,9,6,16,0,0x1,0,3,1,yes,0,0,0,magic,0 , SL_KAUPE,Kaupe -465,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0 , SL_KAITE,Kaite -466,0,0,0,0,0,0,7,0,yes,0,0,0,magic,0 , SL_KAINA,Kaina +462,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0, SL_KAIZEL,Kaizel +463,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0, SL_KAAHI,Kaahi +464,9,6,16,0,0x1,0,3,1,yes,0,0,0,magic,0, SL_KAUPE,Kaupe +465,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0, SL_KAITE,Kaite +466,0,0,0,0,0,0,7,0,yes,0,0,0,magic,0, SL_KAINA,Kaina 467,9,6,1,-2,0,0,7,1,no,0,0,0,magic,2, SL_STIN,Estin 468,9,6,1,-2,0,0,7,1,no,0,0,0,magic,0, SL_STUN,Estun 469,9,8,1,-2,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0, SL_SMA,Esma -470,9,6,1,0,0x1,0,7,1,no,0,0,0,magic,0 , SL_SWOO,Eswoo -471,9,6,1,0,0x1,0,3,1,no,0,0,0,magic,0 , SL_SKE,Eske -472,9,6,1,0,0x1,0,3,1,no,0,0,0,magic,0 , SL_SKA,Eska +470,9,6,1,0,0x1,0,7,1,no,0,0,0,magic,0, SL_SWOO,Eswoo +471,9,6,1,0,0x1,0,3,1,no,0,0,0,magic,0, SL_SKE,Eske +472,9,6,1,0,0x1,0,3,1,no,0,0,0,magic,0, SL_SKA,Eska 473,0,0,0,0,0,0,0,0,no,0,0,0,none,0, SM_SELFPROVOKE,Provoke Self 474,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0, NPC_EMOTION_ON,Emotion ON 475,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0, ST_PRESERVE,Preserve @@ -639,35 +639,35 @@ 1018,9,6,1,3,0x1,0,1,1,yes,0,0x1,0,magic,0, SA_ELEMENTFIRE,Elemental Change Fire 1019,9,6,1,4,0x1,0,1,1,yes,0,0x1,0,magic,0, SA_ELEMENTWIND,Elemental Change Wind -8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0 ,HLIF_HEAL,Healing Touch -8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0 ,HLIF_AVOID,Avoid -8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0 ,HLIF_BRAIN,Brain Surgery -8004,0,6,4,0,0x1,0,3,0,no,0,0,0,none,0 ,HLIF_CHANGE,Change -8005,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 ,HAMI_CASTLE,Castling -8006,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 ,HAMI_DEFENCE,Defense -8007,0,0,0,0,0x1,0,5,0,no,0,0,0,none,0 ,HAMI_SKIN,Adamantium Skin -8008,0,6,4,0,0x1,0,3,0,no,0,0,0,none,0 ,HAMI_BLOODLUST,Bloodlust -8009,1,8,1,0,0,0,5,-1:-2:-2:-2:-3,no,0,0,0,weapon,0 ,HFLI_MOON,Moonlight -8010,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 ,HFLI_FLEET,Fleeting Move -8011,0,6,4,0,0x1,0,5,0,yes,0,0,0,misc,0 ,HFLI_SPEED,Speed -8012,1,6,1,0,0,0,3,0,no,0,0,0,none,0 ,HFLI_SBR44,S.B.R.44 -8013,9,6,1,0,0,0,5,1:2:3:4:5,no,0,0,0,magic,0 ,HVAN_CAPRICE,Caprice -8014,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 ,HVAN_CHAOTIC,Benediction of Chaos -8015,0,0,0,0,0x1,0,5,0,no,0,0,0,none,0 ,HVAN_INSTRUCT,Instruct -8016,4,6,4,-1,0xD2,4,3,1,no,0,0,0,misc,0 ,HVAN_EXPLOSION,Bio Explosion +8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0, HLIF_HEALHealing Touch +8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0, HLIF_AVOID,Avoid +8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0, HLIF_BRAIN,Brain Surgery +8004,0,6,4,0,0x1,0,3,0,no,0,0,0,none,0, HLIF_CHANGE,Change +8005,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0, HAMI_CASTLE,Castling +8006,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0, HAMI_DEFENCE,Defense +8007,0,0,0,0,0x1,0,5,0,no,0,0,0,none,0, HAMI_SKIN,Adamantium Skin +8008,0,6,4,0,0x1,0,3,0,no,0,0,0,none,0, HAMI_BLOODLUST,Bloodlust +8009,1,8,1,0,0,0,5,-1:-2:-2:-2:-3,no,0,0,0,weapon,0,HFLI_MOON,Moonlight +8010,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0, HFLI_FLEET,Fleeting Move +8011,0,6,4,0,0x1,0,5,0,yes,0,0,0,misc,0, HFLI_SPEED,Speed +8012,1,6,1,0,0,0,3,0,no,0,0,0,none,0, HFLI_SBR44,S.B.R.44 +8013,9,6,1,0,0,0,5,1:2:3:4:5,no,0,0,0,magic,0, HVAN_CAPRICE,Caprice +8014,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0, HVAN_CHAOTIC,Benediction of Chaos +8015,0,0,0,0,0x1,0,5,0,no,0,0,0,none,0, HVAN_INSTRUCT,Instruct +8016,4,6,4,-1,0xD2,4,3,1,no,0,0,0,misc,0, HVAN_EXPLOSION,Bio Explosion -10000,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 ,GD_APPROVAL,Official Guild Approval -10001,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 ,GD_KAFRACONTRACT,Kafra Contract -10002,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 ,GD_GUARDRESEARCH,Guardian Research -10003,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 ,GD_GUARDUP,Strengthen Guardians -10004,0,0,0,0,0,0,10,0,no,0,0x10,0,none,0 ,GD_EXTENSION,Guild Extension -10005,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 ,GD_GLORYGUILD,Guild's Glory -10006,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0 ,GD_LEADERSHIP,Great Leadership -10007,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0 ,GD_GLORYWOUNDS,Glorious Wounds -10008,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0 ,GD_SOULCOLD,Cold Heart -10009,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0 ,GD_HAWKEYES,Sharp Gaze -10010,0,0,4,0,0x3,15,1,0,yes,0,0x10,0,none,0 ,GD_BATTLEORDER,Battle Orders -10011,0,0,4,0,0x3,15,3,0,yes,0,0x10,0,none,0 ,GD_REGENERATION,Regeneration -10012,0,0,4,0,0x3,15,1,0,yes,0,0x10,0,none,0 ,GD_RESTORE,Restoration -10013,0,0,4,0,0x3,0,1,0,yes,0,0x10,0,none,0 ,GD_EMERGENCYCALL,Urgent Call -10014,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 ,GD_DEVELOPMENT,Permanent Development +10000,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_APPROVAL,Official Guild Approval +10001,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_KAFRACONTRACT,Kafra Contract +10002,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_GUARDRESEARCHGuardian Research +10003,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_GUARDUP,Strengthen Guardians +10004,0,0,0,0,0,0,10,0,no,0,0x10,0,none,0, GD_EXTENSIONGuild Extension +10005,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_GLORYGUILDGuild's Glory +10006,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0, GD_LEADERSHIPGreat Leadership +10007,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0, GD_GLORYWOUNDSGlorious Wounds +10008,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0, GD_SOULCOLD,Cold Heart +10009,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0, GD_HAWKEYES,Sharp Gaze +10010,0,0,4,0,0x3,15,1,0,yes,0,0x10,0,none,0, GD_BATTLEORDER,Battle Orders +10011,0,0,4,0,0x3,15,3,0,yes,0,0x10,0,none,0, GD_REGENERATION,Regeneration +10012,0,0,4,0,0x3,15,1,0,yes,0,0x10,0,none,0, GD_RESTORE,Restoration +10013,0,0,4,0,0x3,0,1,0,yes,0,0x10,0,none,0, GD_EMERGENCYCALL,Urgent Call +10014,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_DEVELOPMENT,Permanent Development diff --git a/src/map/mob.c b/src/map/mob.c index efe19b507..b5089cab5 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1871,10 +1871,10 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) (i==2 && sd->sc.data[SC_MIRACLE]) //Miracle only applies to Star target )) bonus += (i==2?20:10)*pc_checkskill(sd,sg_info[i].bless_id); - - if(battle_config.mobs_level_up && md->level > md->db->lv) // [Valaris] - bonus += (md->level-md->db->lv)*battle_config.mobs_level_up_exp_rate; } + if(battle_config.mobs_level_up && md->level > md->db->lv) // [Valaris] + bonus += (md->level-md->db->lv)*battle_config.mobs_level_up_exp_rate; + for(i = 0; i < DAMAGELOG_SIZE && md->dmglog[i].id; i++) { int flag=1,zeny=0; @@ -2774,7 +2774,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event) case MSC_MASTERHPLTMAXRATE: flag = ((fbl = mob_getmasterhpltmaxrate(md, ms[i].cond2)) != NULL); break; case MSC_MASTERATTACKED: - flag = (md->master_id > 0 && unit_counttargeted(map_id2bl(md->master_id), 0) > 0); break; + flag = (md->master_id > 0 && (fbl=map_id2bl(md->master_id)) && unit_counttargeted(fbl, 0) > 0); break; case MSC_ALCHEMIST: flag = (md->state.alchemist); break; |