- Fixed the hotkey list sending to the client not displaying right away.

- Corrected the unit_id of NPC_EVILLAND (taken from jA)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11071 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-08-24 01:15:56 +00:00
parent 021481ab09
commit 4612bb8a10
4 changed files with 9 additions and 5 deletions

View File

@ -93,4 +93,4 @@
527,0xbc, , -1, 0,2000,enemy, 0x000 //NJ_TATAMIGAESHI
535,0xbd, , -1, 0, 200,enemy, 0x008 //NJ_KAENSIN
538,0xbb, , 1:1:1:2:2:2:3:3:3:4,0,-1,all,0x000 //NJ_SUITON
670,0x83, , -1, 1,1000,all, 0x008 //NPC_EVILLAND
670,0xc7, , -1, 1,1000,all, 0x008 //NPC_EVILLAND

View File

@ -8046,11 +8046,11 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
int lv;
sd->state.connect_new = 0;
clif_skillinfoblock(sd);
clif_hotkeys_send(sd);
clif_updatestatus(sd,SP_NEXTBASEEXP);
clif_updatestatus(sd,SP_NEXTJOBEXP);
clif_updatestatus(sd,SP_SKILLPOINT);
clif_initialstatus(sd);
clif_hotkeys_send(sd);
if (sd->sc.option&OPTION_FALCON)
clif_status_load(&sd->bl, SI_FALCON, 1);

View File

@ -7262,7 +7262,6 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
}
case UNT_SANCTUARY:
if (sg->skill_id == PR_SANCTUARY) {
if (battle_check_undead(tstatus->race, tstatus->def_ele) || tstatus->race==RC_DEMON)
{ //Only damage enemies with offensive Sanctuary. [Skotlex]
if(battle_check_target(&src->bl,bl,BCT_ENEMY)>0 &&
@ -7285,8 +7284,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
if (sg->val1 <= 0)
skill_delunitgroup(NULL,sg, 0);
break;
}
//Evil Land
case UNT_EVILLAND:
if (!battle_check_undead(tstatus->race, tstatus->def_ele) && tstatus->race!=RC_DEMON)
{ //Damage enemies
if(battle_check_target(&src->bl,bl,BCT_ENEMY)>0)

View File

@ -989,6 +989,11 @@ enum {
UNT_GROUNDDRIFT_POISON,
UNT_GROUNDDRIFT_WATER,
UNT_GROUNDDRIFT_FIRE,
//0xc3 ?
//0xc4 ?
//0xc5 ?
//0xc6 ?
UNT_EVILLAND = 0xc7,
};
#endif /* _SKILL_H_ */