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

** Please update your server ASAP. **

Browse Source 
- Fixed a wrong auth process, setting account offline in Login server when accessing Char server. (OMG!)
- Fixed a bug on TK_JUMPKICK. It should only do damage if can reach target.
- Fixed bug on Arug_cas01 script.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13087 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-08-17 00:21:13 +00:00
parent de3e8cf874
commit 83f55ea8bf
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/guild2/arug_cas01.txt
View File

@ -2506,7 +2506,7 @@ arug_cas01,92,380,3 script Steward#aru01 55,{
mes "allow her to stay with us.";
close;
}
disablenpc "Kafra Employee#arug_cas01";
disablenpc "Kafra Employee#aru01";
SetCastleData "arug_cas01",9,0;
mes "[ Steward ]";
mes "That Kafra Employee";

2
src/char_sql/char.c
View File

@ -226,7 +226,7 @@ void set_char_charselect(int account_id)
if (login_fd > 0 && !session[login_fd]->flag.eof)
{
WFIFOHEAD(login_fd,6);
WFIFOW(login_fd,0) = 0x272c;
WFIFOW(login_fd,0) = 0x272b;
WFIFOL(login_fd,2) = account_id;
WFIFOSET(login_fd,6);
}

18
src/map/skill.c
View File

@ -77,9 +77,9 @@ int skill_name2id(const char* name)
int skill_get_index( int id )
{
// avoid ranges reserved for mapping guild/homun/mercenary skills
if( id >= GD_SKILLRANGEMIN && id <= GD_SKILLRANGEMAX
|| id >= HM_SKILLRANGEMIN && id <= HM_SKILLRANGEMAX
|| id >= MC_SKILLRANGEMIN && id <= MC_SKILLRANGEMAX )
if( (id >= GD_SKILLRANGEMIN && id <= GD_SKILLRANGEMAX)
|| (id >= HM_SKILLRANGEMIN && id <= HM_SKILLRANGEMAX)
|| (id >= MC_SKILLRANGEMIN && id <= MC_SKILLRANGEMAX) )
return 0;
// map skill id to skill db index
@ -2387,9 +2387,11 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
break;
case TK_JUMPKICK:
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
if (unit_movepos(src, bl->x, bl->y, 1, 1)) //Should not jump over objects and cliffs
if( unit_movepos(src, bl->x, bl->y, 1, 1) )
{
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
clif_slide(src,bl->x,bl->y);
}
break;
case SN_SHARPSHOOTING:
@ -10799,9 +10801,9 @@ static bool skill_parse_row_skilldb(char* split[], int columns, int current)
{// id,range,hit,inf,element,nk,splash,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,name,description
int id = atoi(split[0]);
int i;
if( id >= GD_SKILLRANGEMIN && id <= GD_SKILLRANGEMAX
|| id >= HM_SKILLRANGEMIN && id <= HM_SKILLRANGEMAX
|| id >= MC_SKILLRANGEMIN && id <= MC_SKILLRANGEMAX )
if( (id >= GD_SKILLRANGEMIN && id <= GD_SKILLRANGEMAX)
|| (id >= HM_SKILLRANGEMIN && id <= HM_SKILLRANGEMAX)
|| (id >= MC_SKILLRANGEMIN && id <= MC_SKILLRANGEMAX) )
{
ShowWarning("skill_parse_row_skilldb: Skill id %d is forbidden (interferes with guild/homun/mercenary skill mapping)!\n");
return false;