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

- Fixed skill name for skill 39 (MC_PUSHCART)

Browse Source 
- Corrected some formatting in a few entries in skill_db (TODO: if you really want to format the file to have file names aligned, spaces should be used instead of tabs, like it was done for GD/HLIF skills!)
- Corrected placement of leveled up mobs bonus exp
- Fixed a possible crash when parsing MSC_MASTERATTACKED mob skills.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11949 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-12-19 13:10:48 +00:00
parent f32a0b4355
commit a6875211ef
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
db/skill_db.txt
View File

@ -80,7 +80,7 @@
36,0,0,0,0,0,0,10,0,no,0,0,0,none,0, MC_INCCARRY,Enlarge Weight Limit 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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_GLORYGUILD,Guild's Glory 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_LEADERSHIP,Great Leadership 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_GLORYWOUNDS,Glorious Wounds 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 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 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 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 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 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 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 10014,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_DEVELOPMENT,Permanent Development

8
src/map/mob.c
View File

@ -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 (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); 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++) for(i = 0; i < DAMAGELOG_SIZE && md->dmglog[i].id; i++)
{ {
int flag=1,zeny=0; int flag=1,zeny=0;
@ -2774,7 +2774,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
case MSC_MASTERHPLTMAXRATE: case MSC_MASTERHPLTMAXRATE:
flag = ((fbl = mob_getmasterhpltmaxrate(md, ms[i].cond2)) != NULL); break; flag = ((fbl = mob_getmasterhpltmaxrate(md, ms[i].cond2)) != NULL); break;
case MSC_MASTERATTACKED: 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: case MSC_ALCHEMIST:
flag = (md->state.alchemist); flag = (md->state.alchemist);
break; break;