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

* Fixed easter.txt typo.

Browse Source 
* Extended summon command to enable custom timeouts.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5461 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-03-05 09:36:10 +00:00
parent 8e70128bf9
commit 18b0a014dd
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/05
* Fixed easter.txt typo. [Lance]
* Extended summon command to enable custom timeouts. [Lance]
2006/03/04 2006/03/04
* Fixed a bug in the subnet checking function, login-TXT server. Also * Fixed a bug in the subnet checking function, login-TXT server. Also
changed the messages to be a bit more informative. [Skotlex] changed the messages to be a bit more informative. [Skotlex]

3
npc/events/easter.txt
View File

@ -17,8 +17,7 @@
//============================================================ //============================================================
geffen.gat,95,201,3 script Shilo 50, geffen.gat,95,201,3 script Shilo 50,{
{
mes "[Shilo]"; mes "[Shilo]";
if(easter_Q == 1) goto L_Check; if(easter_Q == 1) goto L_Check;
mes "*Sigh*... Where is my sister!?"; mes "*Sigh*... Where is my sister!?";

10
src/map/script.c
View File

@ -7429,7 +7429,7 @@ int buildin_mapwarp(struct script_state *st) // Added by RoVeRT
return 0; return 0;
map_foreachinarea(buildin_areawarp_sub, map_foreachinarea(buildin_areawarp_sub,
m,x0,y0,x1,y1,BL_PC, str,x,y ); m,x0,y0,x1,y1,BL_PC, map_mapname2mapid(str),x,y );
return 0; return 0;
} }
@ -9038,7 +9038,7 @@ int buildin_logmes(struct script_state *st)
int buildin_summon(struct script_state *st) int buildin_summon(struct script_state *st)
{ {
int _class, id; int _class, id, timeout=0;
char *str,*event=""; char *str,*event="";
struct map_session_data *sd; struct map_session_data *sd;
struct mob_data *md; struct mob_data *md;
@ -9049,14 +9049,16 @@ int buildin_summon(struct script_state *st)
str =conv_str(st,& (st->stack->stack_data[st->start+2])); str =conv_str(st,& (st->stack->stack_data[st->start+2]));
_class=conv_num(st,& (st->stack->stack_data[st->start+3])); _class=conv_num(st,& (st->stack->stack_data[st->start+3]));
if( st->end>st->start+4 ) if( st->end>st->start+4 )
event=conv_str(st,& (st->stack->stack_data[st->start+4])); timeout=conv_num(st,& (st->stack->stack_data[st->start+4]));
if( st->end>st->start+5 )
event=conv_str(st,& (st->stack->stack_data[st->start+5]));
id=mob_once_spawn(sd, "this", 0, 0, str,_class,1,event); id=mob_once_spawn(sd, "this", 0, 0, str,_class,1,event);
if((md=(struct mob_data *)map_id2bl(id))){ if((md=(struct mob_data *)map_id2bl(id))){
md->master_id=sd->bl.id; md->master_id=sd->bl.id;
md->special_state.ai=1; md->special_state.ai=1;
md->mode=mob_db(md->class_)->mode|0x04; md->mode=mob_db(md->class_)->mode|0x04;
md->deletetimer=add_timer(tick+60000,mob_timer_delete,id,0); md->deletetimer=add_timer(tick+(timeout<=0?timeout*1000:60000),mob_timer_delete,id,0);
clif_misceffect2(&md->bl,344); clif_misceffect2(&md->bl,344);
} }
clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,sd->bl.x,sd->bl.y,tick); clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,sd->bl.x,sd->bl.y,tick);