From 8e1ec0bf398a4c3fbd2b27caf2fbb206ec2aea7c Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 15 Mar 2006 18:33:32 +0000 Subject: [PATCH] - Removed the hardcoded duration of 30seconds for sleep. - Fixed rangecheck for pet skill usage of INF_SELF_SKILL - Removed inall/exall from atcommand.conf since those two do not exist! (pointed out by Ancyker) - @me now uses entry 270 in msg_athena as output format. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5615 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 6 ++++++ conf-tmpl/atcommand_athena.conf | 9 ++------- conf-tmpl/msg_athena.conf | 2 ++ src/map/atcommand.c | 2 +- src/map/mob.c | 2 +- src/map/pet.c | 3 ++- src/map/status.c | 6 +----- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 02ea6ce18f..e767682434 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,12 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/03/15 + * Removed the hardcoded duration of 30 seconds for sleep. [Skotlex] + * Fixed rangecheck for pet skill usage of INF_SELF_SKILL type of skills + [Skotlex] + * Removed inall/exall from atcommand.conf since those two do not exist! + (pointed out by Ancyker) [Skotlex] + * @me now uses entry 270 in msg_athena as output format. [Skotlex] * gm_skill_unconditional setting now also overrides skill_partner_check setting. [Skotlex] * Emulated strtok_r functions to work strictly with ANSI compilers. [Lance] diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf index 4cb096fff0..d45287c109 100644 --- a/conf-tmpl/atcommand_athena.conf +++ b/conf-tmpl/atcommand_athena.conf @@ -219,13 +219,8 @@ undisguise: 20 // Display ignore list of a player (people from which the player ignore wisps) charignorelist: 20 -// Enable all wispers for a player -inall: 20 - -// Disable all wispers for a player -exall: 20 - -// Displays the OUTPUT string on top of all the Visible players Heads.(Similar like the /me command in IRC) +// Displays the text as a normal message with the format "*name message*" +// instead of "name : message" (Like the /me command in IRC) me: 20 // Changes your name to your choice temporarly. diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf index 24a3a889aa..5b532873ae 100644 --- a/conf-tmpl/msg_athena.conf +++ b/conf-tmpl/msg_athena.conf @@ -278,6 +278,8 @@ 267: '%s' designated maps reseted! 268: Reloaded the Message of the Day. 269: Displaying first %d out of %d matches +//@me output format +270: *%s %s* // Guild Castles Number // -------------------- 299: ?? Castles diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a9f3ccef2a..4bc9d5ec5b 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9700,7 +9700,7 @@ int atcommand_me( } sscanf(message, "%199[^\n]", tempmes); - sprintf(atcmd_output, "* %s %s *", sd->status.name, tempmes); + sprintf(atcmd_output, msg_txt(270), sd->status.name, tempmes); clif_disp_overhead(sd, atcmd_output); return 0; diff --git a/src/map/mob.c b/src/map/mob.c index 911841cb13..822eb61d98 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3513,7 +3513,7 @@ int mobskill_use_id(struct mob_data *md,struct block_list *target,int skill_idx) switch(skill_id){ /* 何か特殊な処理が必要 */ case ALL_RESURRECTION: /* リザレクション */ - if(target->type != BL_PC && battle_check_undead(status_get_race(target),status_get_elem_type(target))){ /* 敵がアンデッドなら */ + if(battle_check_undead(status_get_race(target),status_get_elem_type(target))){ /* 敵がアンデッドなら */ forcecast=1; /* ターンアンデットと同じ詠唱時間 */ casttime=skill_castfix(&md->bl, PR_TURNUNDEAD,skill_lv, 0); } diff --git a/src/map/pet.c b/src/map/pet.c index edbe3d5dca..306f21ff2b 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -315,7 +315,8 @@ static int petskill_castend2(struct pet_data *pd, struct block_list *target, uns } else { //Targeted Skill if (!target) return 0; - if(!check_distance_bl(&pd->bl, target, + if(!skill_get_inf(skill_id)&INF_SELF_SKILL && //No range check for self skills. + !check_distance_bl(&pd->bl, target, skill_get_range2(&pd->bl, skill_id, skill_lv))) return 0; diff --git a/src/map/status.c b/src/map/status.c index 48d7629002..ff1eb1fd05 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4009,10 +4009,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val if(val3 < 1) val3 = 1; tick = 5000; break; - case SC_SLEEP: /* 睡眠 */ - if(!(flag&4)) - tick = 30000;//睡眠はステ?タス耐性に?わらず30秒 - break; /* option2 */ case SC_DPOISON: /* 猛毒 */ @@ -4454,7 +4450,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_MAXOVERTHRUST: case SC_SILENCE: /* 沈?（レックスデビ?ナ） */ case SC_ASSUMPTIO: /* アスムプティオ */ - break; + case SC_SLEEP: // gs_something1 [Vicious] case SC_MADNESSCANCEL: case SC_ADJUSTMENT: