From 422a0536cfc1074f534cf31885b18807cdff6d80 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 15 May 2006 14:15:04 +0000 Subject: - Added SC_BLADESTOP to the switch listing in status_change_start - Characters in vending are now always considered "idle" if the idle_no_share setting is active. - Corrected 10 Geminis spawning in Lhz1 rather than 2. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6595 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 3 +++ conf-tmpl/battle/party.conf | 2 +- npc/Changelog.txt | 2 ++ npc/mobs/dungeons/lhzdun.txt | 2 +- src/map/clif.c | 8 -------- src/map/party.c | 2 +- src/map/status.c | 1 + 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 10f176214..ef5d0723a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ 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. 2006/05/15 + * Added SC_BLADESTOP to the switch listing in status_change_start [Skotlex] + * Characters in vending are now always considered "idle" if the + idle_no_share setting is active. [Skotlex] * Players with OPTION_INVISIBLE should not be sent to clients. [Lance] * Remaining fixes for item scripts. [Lance] * Added NPC event deprecated warnings to ease debugging old scripts. [Lance] diff --git a/conf-tmpl/battle/party.conf b/conf-tmpl/battle/party.conf index 51452cc9e..c588152a8 100644 --- a/conf-tmpl/battle/party.conf +++ b/conf-tmpl/battle/party.conf @@ -42,7 +42,7 @@ party_item_share_type: 0 // Is exp sharing disabled for idle members in the party? // Set to no, or the amount of seconds (NOT milliseconds) that need to pass before considering // a character idle. -// Characters in a chat are always considered idle. +// Characters in a chat/vending are always considered idle. // A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement. idle_no_share: no diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 50ae86d41..1ab661f9e 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -27,6 +27,8 @@ Nexon Date Added ====== +05/15 + * Corrected 10 Geminis spawning in Lhz1 rather than 2. [Skotlex] 05/14 * Fixed the quiz in the Wizard Job quest a bit [Playtester] 05/13 diff --git a/npc/mobs/dungeons/lhzdun.txt b/npc/mobs/dungeons/lhzdun.txt index 026ede3f8..e68ccb62b 100644 --- a/npc/mobs/dungeons/lhzdun.txt +++ b/npc/mobs/dungeons/lhzdun.txt @@ -46,7 +46,7 @@ lhz_dun02.gat,0,0,0,0 monster Armeyer Dinze 1654,50,0,0,0 lhz_dun02.gat,0,0,0,0 monster Errende Ebecee 1655,50,0,0,0 lhz_dun02.gat,0,0,0,0 monster Kavach Icarus 1656,50,0,0,0 lhz_dun02.gat,0,0,0,0 monster Laurell Weinder 1657,50,0,0,0 -lhz_dun01.gat,0,0,0,0 monster Gemini-S58 1681,10,1800000,900000,1 +lhz_dun02.gat,0,0,0,0 monster Gemini-S58 1681,10,1800000,900000,1 lhz_dun02.gat,0,0,0,0 monster Egnigem Cenia 1658,1,7200000,3600000,1 //======================================================================================== diff --git a/src/map/clif.c b/src/map/clif.c index d46f52397..fa243eb1e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -763,14 +763,6 @@ int clif_clearchar_delay(unsigned int tick, struct block_list *bl, int type) { *------------------------------------------ */ int clif_clearchar_id(int id, int type, int fd) { - /*unsigned char buf[16]; - - WBUFW(buf,0) = 0x80; - WBUFL(buf,2) = id; - WBUFB(buf,6) = type; - WFIFOHEAD(fd, packet_len_table[0x80]); - memcpy(WFIFOP(fd,0), buf, 7); - WFIFOSET(fd, packet_len_table[0x80]);*/ WFIFOHEAD(fd, packet_len_table[0x80]); WFIFOW(fd,0) = 0x80; diff --git a/src/map/party.c b/src/map/party.c index 8ee9f715d..7c72d23ad 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -669,7 +669,7 @@ int party_exp_share(struct party *p,int map,unsigned int base_exp,unsigned int j for (i = c = 0; i < MAX_PARTY; i++) if ((sd[c] = p->member[i].sd)!=NULL && sd[c]->bl.m == map && !pc_isdead(sd[c])) { - if (battle_config.idle_no_share && (sd[c]->chatID || (sd[c]->idletime < (last_tick - battle_config.idle_no_share)))) + if (battle_config.idle_no_share && (sd[c]->chatID || sd[c]->vender_id || (sd[c]->idletime < (last_tick - battle_config.idle_no_share)))) continue; c++; } diff --git a/src/map/status.c b/src/map/status.c index db6adb7b5..0c4516bc7 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4633,6 +4633,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_SLEEP: case SC_SMA: case SC_WARM: + case SC_BLADESTOP: break; // gs_something1 [Vicious] case SC_MADNESSCANCEL: -- cgit v1.2.3-60-g2f50