summaryrefslogtreecommitdiff
path: root/src/map/skill.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-12-21 22:07:37 -0800
committerBen Longbons <b.r.longbons@gmail.com>2012-12-24 10:02:20 -0800
commit7afacd63fe36eb56b52490ecf22daeaa95657942 (patch)
tree53711f61f99d5659a8ef516415655f7e1427dca0 /src/map/skill.cpp
parente5360f5bdfbc67aecd42c9ebda2a42cee732693d (diff)
downloadtmwa-7afacd63fe36eb56b52490ecf22daeaa95657942.tar.gz
tmwa-7afacd63fe36eb56b52490ecf22daeaa95657942.tar.bz2
tmwa-7afacd63fe36eb56b52490ecf22daeaa95657942.tar.xz
tmwa-7afacd63fe36eb56b52490ecf22daeaa95657942.zip
Remove sending of packets the client can't handle
Diffstat (limited to 'src/map/skill.cpp')
-rw-r--r--src/map/skill.cpp265
1 files changed, 5 insertions, 260 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index f45f73d..06351dc 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -1394,7 +1394,7 @@ int skill_additional_effect(struct block_list *src, struct block_list *bl,
pc_checkskill(sd, TF_STEAL)) * 10 > MRAND(1000))
{
if (pc_steal_item(sd, bl))
- clif_skill_nodamage(src, bl, TF_STEAL, skill2, 1);
+ {}
else
clif_skill_fail(sd, skillid, 0, 0);
}
@@ -2010,10 +2010,8 @@ int skill_attack(int attack_type, struct block_list *src,
}
else //回復SP+現在のSPがMSPより小さい場合は回復SPを加算
((struct map_session_data *) bl)->status.sp += sp;
- clif_heal(((struct map_session_data *) bl)->fd, SP_SP, sp); //SP回復エフェクトの表示
((struct map_session_data *) bl)->canact_tick = tick + skill_delayfix(bl, skill_get_delay(SA_MAGICROD, sc_data[SC_MAGICROD].val1)); //
}
- clif_skill_nodamage(bl, bl, SA_MAGICROD, sc_data[SC_MAGICROD].val1, 1); //マジックロッドエフェクトを表示
}
//マジックロッド処理ここまで
@@ -2055,7 +2053,6 @@ int skill_attack(int attack_type, struct block_list *src,
0, 0, delay, 0); //コンボ状態に
}
sd->attackabletime = sd->canmove_tick = tick + delay;
- clif_combo_delay(src, delay); //コンボディレイパケットの送信
}
//連打掌(MO_CHAINCOMBO)ここまで
//猛龍拳(MO_COMBOFINISH)ここから
@@ -2081,7 +2078,6 @@ int skill_attack(int attack_type, struct block_list *src,
0, 0, delay, 0); //コンボ状態に
}
sd->attackabletime = sd->canmove_tick = tick + delay;
- clif_combo_delay(src, delay); //コンボディレイパケットの送信
}
//猛龍拳(MO_COMBOFINISH)ここまで
//伏虎拳(CH_TIGERFIST)ここから
@@ -2099,7 +2095,6 @@ int skill_attack(int attack_type, struct block_list *src,
0, 0, delay, 0); //コンボ状態に
}
sd->attackabletime = sd->canmove_tick = tick + delay;
- clif_combo_delay(src, delay); //コンボディレイパケットの送信
}
//伏虎拳(CH_TIGERFIST)ここまで
//連柱崩撃(CH_CHAINCRUSH)ここから
@@ -2120,7 +2115,6 @@ int skill_attack(int attack_type, struct block_list *src,
0, 0, delay, 0); //コンボ状態に
}
sd->attackabletime = sd->canmove_tick = tick + delay;
- clif_combo_delay(src, delay); //コンボディレイパケットの送信
}
//連柱崩撃(CH_CHAINCRUSH)ここまで
}
@@ -2540,8 +2534,6 @@ void skill_timer(timer_id, tick_t tick, custom_id_t id, custom_data_t data)
switch (skl->skill_id)
{
case TF_BACKSLIDING:
- clif_skill_nodamage(src, src, skl->skill_id, skl->skill_lv,
- 1);
break;
case RG_INTIMIDATE:
if (sd && !map[src->m].flag.noteleport)
@@ -2630,8 +2622,6 @@ void skill_timer(timer_id, tick_t tick, custom_id_t id, custom_data_t data)
skill_unitsetting(src, skl->skill_id, skl->skill_lv,
skl->type >> 16, skl->type & 0xFFFF,
0);
- clif_skill_poseffect(src, skl->skill_id, skl->skill_lv,
- skl->x, skl->y, tick);
}
else
skill_unitsetting(src, skl->skill_id, skl->skill_lv,
@@ -3231,7 +3221,6 @@ int skill_castend_damage_id(struct block_list *src, struct block_list *bl,
break;
case WZ_SIGHTRASHER:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_castend_pos2(src, bl->x, bl->y, skillid, skilllv, tick, 0);
skill_status_change_end(src, SC_SIGHT, -1);
break;
@@ -3302,8 +3291,6 @@ int skill_castend_damage_id(struct block_list *src, struct block_list *bl,
{
skill_area_temp[1] = bl->id;
skill_area_temp[2] = battle_get_hp(src);
- clif_skill_nodamage(src, src, NPC_SELFDESTRUCTION, -1,
- 1);
map_foreachinarea(std::bind(skill_area_sub, ph::_1, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, skill_castend_damage_id),
bl->m, bl->x - 5, bl->y - 5,
bl->x + 5, bl->y + 5, 0);
@@ -3322,15 +3309,7 @@ int skill_castend_damage_id(struct block_list *src, struct block_list *bl,
NPC_BLOODDRAIN) ? BF_WEAPON : BF_MAGIC, src,
src, bl, skillid, skilllv, tick, flag);
if (heal > 0)
- {
- struct block_list tbl;
- tbl.id = 0;
- tbl.m = src->m;
- tbl.x = src->x;
- tbl.y = src->y;
- clif_skill_nodamage(&tbl, src, AL_HEAL, heal, 1);
battle_heal(NULL, src, heal, 0, 0);
- }
}
break;
case SkillID::ZERO:
@@ -3446,7 +3425,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
heal = heal * 2; //スパノビの嫁が旦那にヒールすると2倍になる
}
- clif_skill_nodamage(src, bl, skillid, heal, 1);
heal_get_jobexp = battle_heal(NULL, bl, heal, 0, 0);
// JOB経験値獲得
@@ -3474,7 +3452,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
if (pc_isdead(tsd))
{ /* 死亡判定 */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
switch (skilllv)
{
case 1:
@@ -3548,7 +3525,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
(battle_get_lv(src) + battle_get_int(src) / 5) -
sc_def_mdef))
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl,
SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0,
@@ -3577,7 +3553,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
else
{
int range = 15;
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
map_foreachinarea(std::bind(skill_area_sub, ph::_1, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, skill_castend_nodamage_id),
src->m, src->x - range, src->y - range,
src->x + range, src->y + range, 0);
@@ -3587,7 +3562,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case PR_LEXDIVINA: /* レックスディビーナ */
{
eptr<struct status_change, StatusChange> sc_data = battle_get_sc_data(bl);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -3607,7 +3581,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case SA_ABRACADABRA:
break;
case SA_COMA:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -3623,7 +3596,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
dstmd->hp = 1;
break;
case SA_FULLRECOVERY:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -3634,51 +3606,42 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
dstmd->hp = battle_get_max_hp(&dstmd->bl);
break;
case SA_SUMMONMONSTER:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (sd)
mob_once_spawn(sd, map[sd->bl.m].name, sd->bl.x, sd->bl.y,
"--ja--", -1, 1, "");
break;
case SA_LEVELUP:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (sd && pc_nextbaseexp(sd))
pc_gainexp(sd, pc_nextbaseexp(sd) * 10 / 100, 0);
break;
case SA_INSTANTDEATH:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (sd)
pc_damage(NULL, sd, sd->status.max_hp);
break;
case SA_QUESTION:
case SA_GRAVITY:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
break;
case SA_CLASSCHANGE:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (dstmd)
mob_class_change(dstmd, changeclass);
break;
case SA_MONOCELL:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (dstmd)
mob_class_change(dstmd, poringclass);
break;
case SA_DEATH:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (dstsd)
pc_damage(NULL, dstsd, dstsd->status.max_hp);
if (dstmd)
mob_damage(NULL, dstmd, dstmd->hp, 1);
break;
case SA_REVERSEORCISH:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (dstsd)
pc_setoption(dstsd, dstsd->status.option | Option::ORC_HEAD);
break;
case SA_FORTUNE:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (sd)
pc_getzeny(sd, battle_get_lv(bl) * 100);
break;
@@ -3695,7 +3658,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
}
else
{
@@ -3704,7 +3666,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv),
0);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
}
break;
@@ -3716,7 +3677,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 0);
break;
}
if (bl->type == BL_PC)
@@ -3730,14 +3690,12 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
|| sd2->sc_data[SC_ENCPOISON].timer != -1)
{
clif_skill_fail(sd, skillid, 0, 0);
- clif_skill_nodamage(src, bl, skillid, skilllv, 0);
break;
}
}
if (MRAND(100) > (75 + skilllv * 1) && (skilllv != 5))
{
clif_skill_fail(sd, skillid, 0, 0);
- clif_skill_nodamage(src, bl, skillid, skilllv, 0);
if (bl->type == BL_PC && battle_config.equipment_breaking)
{
struct map_session_data *sd2 =
@@ -3756,12 +3714,10 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv),
0);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
}
break;
case PR_ASPERSIO: /* アスペルシオ */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -3773,7 +3729,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
skill_get_time(skillid, skilllv), 0);
break;
case PR_KYRIE: /* キリエエレイソン */
- clif_skill_nodamage(bl, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -3805,7 +3760,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case ST_REJECTSWORD: /* リジェクトソード */
case HW_MAGICPOWER: /* 魔法力増幅 */
case PF_MEMORIZE: /* メモライズ */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv), 0);
@@ -3820,18 +3774,15 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
|| sd2->sc_data[SC_SEISMICWEAPON].timer != -1
|| sd2->sc_data[SC_ENCPOISON].timer != -1)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 0);
clif_skill_fail(sd, skillid, 0, 0);
break;
}
}
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv), 0);
break;
case LK_TENSIONRELAX: /* テンションリラックス */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
pc_setsit(sd);
clif_sitting(sd->fd, sd);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
@@ -3839,12 +3790,10 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
skill_get_time(skillid, skilllv), 0);
break;
case MC_CHANGECART:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
break;
case AC_CONCENTRATION: /* 集中力向上 */
{
int range = 1;
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv), 0);
@@ -3864,7 +3813,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
return 1;
}
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv), 0);
@@ -3934,8 +3882,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
return 1;
}
}
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
- clif_devotion(sd, bl->id);
skill_status_change_start(bl,
SkillStatusChangeTable[skillid],
src->id, 1, 0, 0,
@@ -3947,7 +3893,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case MO_CALLSPIRITS: // 気功
if (sd)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
pc_addspiritball(sd, skill_get_time(skillid, skilllv),
skilllv);
}
@@ -3955,14 +3900,12 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case CH_SOULCOLLECT: // 狂気功
if (sd)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
for (int i = 0; i < 5; i++)
pc_addspiritball(sd, skill_get_time(skillid, skilllv),
5);
}
break;
case MO_BLADESTOP: // 白刃取り
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(src, SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv), 0);
@@ -3976,7 +3919,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
if (dstsd->spiritball > 0)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
i = dstsd->spiritball * 7;
pc_delspiritball(dstsd, dstsd->spiritball, 0);
if (i > 0x7FFF)
@@ -3996,42 +3938,20 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
}
}
if (i)
- {
sd->status.sp += i;
- clif_heal(sd->fd, SP_SP, i);
- }
- else
- clif_skill_nodamage(src, bl, skillid, skilllv, 0);
break;
}
case AC_MAKINGARROW: /* 矢作成 */
-/* if (sd) {
- clif_arrow_create_list(sd);
- clif_skill_nodamage(src,bl,skillid,skilllv,1);
- }*/
break;
case AM_PHARMACY: /* ポーション作成 */
-/* if (sd) {
- clif_skill_produce_mix_list(sd,32);
- clif_skill_nodamage(src,bl,skillid,skilllv,1);
- }*/
break;
case WS_CREATECOIN: /* クリエイトコイン */
-/* if (sd) {
- clif_skill_produce_mix_list(sd,64);
- clif_skill_nodamage(src,bl,skillid,skilllv,1);
- }*/
break;
case WS_CREATENUGGET: /* 塊製造 */
-/* if (sd) {
- clif_skill_produce_mix_list(sd,128);
- clif_skill_nodamage(src,bl,skillid,skilllv,1);
- }*/
break;
case BS_HAMMERFALL: /* ハンマーフォール */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_weapon_damage)
@@ -4045,7 +3965,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case RG_RAID: /* サプライズアタック */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
{
int x = bl->x, y = bl->y;
skill_area_temp[1] = bl->id;
@@ -4122,8 +4041,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case SN_WINDWALK: /* ウインドウォーク */
if (sd == NULL || sd->status.party_id == 0 || (flag & 1))
{
- /* 個別の処理 */
- clif_skill_nodamage(bl, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -4146,8 +4063,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case BS_OVERTHRUST: /* オーバートラスト */
if (sd == NULL || sd->status.party_id == 0 || (flag & 1))
{
- /* 個別の処理 */
- clif_skill_nodamage(bl, bl, skillid, skilllv, 1);
skill_status_change_start(bl,
SkillStatusChangeTable[skillid],
skilllv, (src == bl) ? 1 : 0, 0, 0,
@@ -4170,7 +4085,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
StatusChange sc = SkillStatusChangeTable[skillid];
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (tsc_data)
{
if (tsc_data[sc].timer == -1)
@@ -4189,7 +4103,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
StatusChange sc = SkillStatusChangeTable[skillid];
- clif_skill_nodamage(src, bl, skillid, -1, 1);
if (tsc_data)
{
if (tsc_data[sc].timer == -1)
@@ -4208,7 +4121,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
StatusChange sc = SkillStatusChangeTable[skillid];
- clif_skill_nodamage(src, bl, skillid, -1, 1);
if (tsc_data)
{
if (tsc_data[sc].timer == -1)
@@ -4229,7 +4141,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
StatusChange sc = SkillStatusChangeTable[skillid];
- clif_skill_nodamage(src, bl, skillid, -1, 1);
if (tsc_data)
{
if (tsc_data[sc].timer == -1)
@@ -4264,14 +4175,12 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case DC_FORTUNEKISS: /* 幸運のキス */
case DC_SERVICEFORYOU: /* サービスフォーユー */
case CG_MOONLIT: /* 月明りの泉に落ちる花びら */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_unitsetting(src, skillid, skilllv, src->x, src->y, 0);
break;
case HP_BASILICA: /* バジリカ */
case PA_GOSPEL: /* ゴスペル */
skill_clear_unitgroup(src);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_unitsetting(src, skillid, skilllv, src->x, src->y, 0);
break;
@@ -4279,28 +4188,17 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
eptr<struct status_change, StatusChange> sc_data = battle_get_sc_data(src);
if (sc_data && sc_data[SC_DANCING].timer != -1)
- {
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_stop_dancing(src, 0);
- }
}
break;
case BA_FROSTJOKE: /* 寒いジョーク */
case DC_SCREAM: /* スクリーム */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_addtimerskill(src, tick + 3000, bl->id, 0, 0, skillid,
skilllv, 0, flag);
break;
case TF_STEAL: // スティール
- if (sd)
- {
- if (pc_steal_item(sd, bl))
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
- else
- clif_skill_nodamage(src, bl, skillid, skilllv, 0);
- }
break;
case RG_STEALCOIN: // スティールコイン
@@ -4311,11 +4209,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
int range = skill_get_range(skillid, skilllv);
if (range < 0)
range = battle_get_range(src) - (range + 1);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
mob_target((struct mob_data *) bl, src, range);
}
- else
- clif_skill_nodamage(src, bl, skillid, skilllv, 0);
}
break;
@@ -4325,7 +4220,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
clif_skill_fail(sd, sd->skillid, 0, 0);
break;
}
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -4341,12 +4235,10 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case NV_FIRSTAID: /* 応急手当 */
- clif_skill_nodamage(src, bl, skillid, 5, 1);
battle_heal(NULL, bl, 5, 0, 0);
break;
case AL_CURE: /* キュアー */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -4362,13 +4254,11 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case TF_DETOXIFY: /* 解毒 */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_end(bl, SC_POISON, -1);
break;
case PR_STRECOVERY: /* リカバリー */
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -4404,43 +4294,16 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case WZ_ESTIMATION: /* モンスター情報 */
- if (src->type == BL_PC)
- {
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
- clif_skill_estimation((struct map_session_data *) src, bl);
- }
break;
case MC_IDENTIFY: /* アイテム鑑定 */
- if (sd)
- clif_item_identify_list(sd);
break;
case BS_REPAIRWEAPON: /* 武器修理 */
- if (sd)
-//動作しないのでとりあえずコメントアウト
-// clif_item_repair_list(sd);
- break;
+ break;
case AL_TELEPORT: /* テレポート */
- if (sd)
- {
- if (map[sd->bl.m].flag.noteleport)
- { /* テレポ禁止 */
- clif_skill_teleportmessage(sd, 0);
- break;
- }
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
- if (sd->skilllv == 1)
- clif_skill_warppoint(sd, sd->skillid, "Random", "", "",
- "");
- else
- {
- clif_skill_warppoint(sd, sd->skillid, "Random",
- sd->status.save_point.map, "", "");
- }
- }
- else if (bl->type == BL_MOB)
+ if (bl->type == BL_MOB)
mob_warp((struct mob_data *) bl, -1, -1, -1, 3);
break;
@@ -4449,7 +4312,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
int eflag;
struct item item_tmp;
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = 523;
item_tmp.identify = 1;
@@ -4474,7 +4336,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
int eflag;
struct item item_tmp;
struct block_list tbl;
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
memset(&item_tmp, 0, sizeof(item_tmp));
memset(&tbl, 0, sizeof(tbl)); // [MouseJstr]
item_tmp.nameid = 7049;
@@ -4501,7 +4362,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2;
if (MRAND(100) < strip_per)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl,
SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0, strip_time, 0);
@@ -4531,7 +4391,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2;
if (MRAND(100) < strip_per)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl,
SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0, strip_time, 0);
@@ -4561,7 +4420,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2;
if (MRAND(100) < strip_per)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl,
SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0, strip_time, 0);
@@ -4590,7 +4448,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2;
if (MRAND(100) < strip_per)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl,
SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0, strip_time, 0);
@@ -4612,7 +4469,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
/* PotionPitcher */
case AM_POTIONPITCHER: /* ポーションピッチャー */
{
- struct block_list tbl;
int i, x, hp = 0, sp = 0;
if (sd)
{
@@ -4706,22 +4562,12 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
hp = hp * (100 +
pc_checkskill(dstsd, SM_RECOVERY) * 10) / 100;
}
- tbl.id = 0;
- tbl.m = src->m;
- tbl.x = src->x;
- tbl.y = src->y;
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
- if (hp > 0 || (hp <= 0 && sp <= 0))
- clif_skill_nodamage(&tbl, bl, AL_HEAL, hp, 1);
- if (sp > 0)
- clif_skill_nodamage(&tbl, bl, MG_SRECOVERY, sp, 1);
battle_heal(src, bl, hp, sp, 0);
}
break;
case AM_CP_WEAPON:
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (tsc_data && tsc_data[SC_STRIPWEAPON].timer != -1)
skill_status_change_end(bl, SC_STRIPWEAPON, -1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
@@ -4732,7 +4578,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case AM_CP_SHIELD:
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (tsc_data && tsc_data[SC_STRIPSHIELD].timer != -1)
skill_status_change_end(bl, SC_STRIPSHIELD, -1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
@@ -4743,7 +4588,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case AM_CP_ARMOR:
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (tsc_data && tsc_data[SC_STRIPARMOR].timer != -1)
skill_status_change_end(bl, SC_STRIPARMOR, -1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
@@ -4754,7 +4598,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case AM_CP_HELM:
{
eptr<struct status_change, StatusChange> tsc_data = battle_get_sc_data(bl);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (tsc_data && tsc_data[SC_STRIPHELM].timer != -1)
skill_status_change_end(bl, SC_STRIPHELM, -1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
@@ -4764,7 +4607,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case SA_DISPELL: /* ディスペル */
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -4797,7 +4639,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case SA_CASTCANCEL:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_castcancel(src, 1);
if (sd)
{
@@ -4829,10 +4670,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
}
else
dstsd->status.sp += sp;
- clif_heal(dstsd->fd, SP_SP, sp);
}
- clif_skill_nodamage(bl, bl, SA_MAGICROD,
- sc_data[SC_MAGICROD].val1, 1);
if (sd)
{
sp = sd->status.max_sp / 5;
@@ -4865,7 +4703,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
&& bl_skillid != SkillID::NEGATIVE
&& skill_db[bl_skillid].skill_type == BF_MAGIC)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_castcancel(bl, 0);
sp = skill_get_sp(bl_skillid, bl_skilllv);
if (dstsd)
@@ -4886,7 +4723,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
}
else
sd->status.sp += sp;
- clif_heal(sd->fd, SP_SP, sp);
}
}
else if (sd)
@@ -4904,9 +4740,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
skill_get_time(skillid, skilllv), 0);
break;
case SA_AUTOSPELL: /* オートスペル */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (sd)
- clif_autospell(sd, skilllv);
+ {}
else
{
int maxlv = 1;
@@ -4962,7 +4797,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case NPC_CHANGETELEKINESIS:
if (md)
{
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
md->def_ele = skill_get_pl(skillid);
if (md->def_ele == 0) /* ランダム変化、ただし、 */
md->def_ele = MRAND(10); /* 不死属性は除く */
@@ -4971,7 +4805,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case NPC_HALLUCINATION:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -4985,7 +4818,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case NPC_BARRIER:
{
int skill_time = skill_get_time(skillid, skilllv);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0, skill_time, 0);
mob_changestate((struct mob_data *) src, MS_DELAY, skill_time);
@@ -4995,7 +4827,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case NPC_DARKBLESSING:
{
int sc_def = 100 - battle_get_mdef(bl);
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
@@ -5022,7 +4853,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
skill_get_time(skillid, skilllv), 0);
break;
case NPC_LICK:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->
special_state.no_weapon_damage)
@@ -5037,10 +4867,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case NPC_SUICIDE: /* 自決 */
if (src && bl && md)
- {
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
mob_damage(NULL, md, md->hp, 0);
- }
break;
case NPC_SUMMONSLAVE: /* 手下召喚 */
@@ -5068,7 +4895,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case NPC_DEFENDER:
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
break;
case WE_MALE: /* 君だけは護るよ */
@@ -5078,7 +4904,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
(skilllv <=
0) ? 0 : skill_db[skillid].hp_rate[skilllv - 1];
int gain_hp = sd->status.max_hp * abs(hp_rate) / 100; // 15%
- clif_skill_nodamage(src, bl, skillid, gain_hp, 1);
battle_heal(NULL, bl, gain_hp, 0, 0);
}
break;
@@ -5089,7 +4914,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
(skilllv <=
0) ? 0 : skill_db[skillid].sp_rate[skilllv - 1];
int gain_sp = sd->status.max_sp * abs(sp_rate) / 100; // 15%
- clif_skill_nodamage(src, bl, skillid, gain_sp, 1);
battle_heal(NULL, bl, 0, gain_sp, 0);
}
break;
@@ -5099,7 +4923,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
{
if (map[sd->bl.m].flag.nomemo)
{
- clif_skill_teleportmessage(sd, 1);
return 0;
}
if ((dstsd = pc_get_partner(sd)) == NULL)
@@ -5113,7 +4936,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case PF_HPCONVERSION: /* ライフ置き換え */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (sd)
{
int conv_hp = 0, conv_sp = 0;
@@ -5126,11 +4948,9 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
sd->status.sp : conv_sp;
sd->status.sp += conv_sp; //SPを増やす
pc_heal(sd, -conv_hp, conv_sp);
- clif_heal(sd->fd, SP_SP, conv_sp);
}
break;
case HT_REMOVETRAP: /* リムーブトラップ */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
{
struct skill_unit *su = NULL;
struct item item_tmp;
@@ -5206,7 +5026,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
}
break;
case HT_SPRINGTRAP: /* スプリングトラップ */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
{
struct skill_unit *su = NULL;
if ((bl->type == BL_SKILL) && (su = (struct skill_unit *) bl)
@@ -5235,7 +5054,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
}
break;
case BD_ENCORE: /* アンコール */
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
if (sd)
skill_use_id(sd, src->id, sd->skillid_dance,
sd->skilllv_dance);
@@ -5243,7 +5061,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
case AS_SPLASHER: /* ベナムスプラッシャー */
if ((double) battle_get_max_hp(bl) * 2 / 3 < battle_get_hp(bl)) //HPが2/3以上残っていたら失敗
return 1;
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
skilllv, uint16_t(skillid), src->id, 0,
skill_get_time(skillid, skilllv), 0);
@@ -5259,7 +5076,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
return 1;
}
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
skill_status_change_start(bl, SkillStatusChangeTable[skillid],
skilllv, 0, 0, 0,
skill_get_time(skillid, skilllv), 0);
@@ -5294,7 +5110,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl,
break;
case RG_CLEANER: //AppleGirl
- clif_skill_nodamage(src, bl, skillid, skilllv, 1);
{
struct skill_unit *su = NULL;
if ((bl->type == BL_SKILL) &&
@@ -5511,10 +5326,6 @@ int skill_castend_pos2(struct block_list *src, int x, int y,
{
nullpo_ret(sd = (struct map_session_data *) src);
}
- if (skillid != WZ_METEOR &&
- skillid != WZ_SIGHTRASHER &&
- skillid != AM_CANNIBALIZE && skillid != AM_SPHEREMINE)
- clif_skill_poseffect(src, skillid, skilllv, x, y, tick);
if (skillnotok(skillid, sd)) // [MouseJstr]
return 0;
@@ -5617,11 +5428,7 @@ int skill_castend_pos2(struct block_list *src, int x, int y,
if (j >= 100)
continue;
if (flag_ == 0)
- {
- clif_skill_poseffect(src, skillid, skilllv, tmpx, tmpy,
- tick);
flag_ = 1;
- }
if (i > 0)
skill_addtimerskill(src, tick + i * 1000, 0, tmpx, tmpy,
skillid, skilllv, (x1 << 16) | y1,
@@ -5635,20 +5442,6 @@ int skill_castend_pos2(struct block_list *src, int x, int y,
break;
case AL_WARP: /* ワープポータル */
- if (sd)
- {
- if (map[sd->bl.m].flag.noteleport) /* テレポ禁止 */
- break;
- clif_skill_warppoint(sd, sd->skillid,
- sd->status.save_point.map,
- (sd->skilllv >
- 1) ? sd->status.memo_point[0].map : "",
- (sd->skilllv >
- 2) ? sd->status.memo_point[1].map : "",
- (sd->skilllv >
- 3) ? sd->status.
- memo_point[2].map : "");
- }
break;
case MO_BODYRELOCATION:
if (sd)
@@ -5678,7 +5471,6 @@ int skill_castend_pos2(struct block_list *src, int x, int y,
skill_get_time(skillid, skilllv),
mob_timer_delete, id, 0);
}
- clif_skill_poseffect(src, skillid, skilllv, x, y, tick);
}
break;
case AM_SPHEREMINE: // スフィアーマイン
@@ -5701,7 +5493,6 @@ int skill_castend_pos2(struct block_list *src, int x, int y,
skill_get_time(skillid, skilllv),
mob_timer_delete, id, 0);
}
- clif_skill_poseffect(src, skillid, skilllv, x, y, tick);
}
break;
}
@@ -6412,7 +6203,6 @@ struct skill_unit_group *skill_unitsetting(struct block_list *src,
else
{
map_setcell(src->m, ux, uy, 5);
- clif_changemapcell(src->m, ux, uy, 5, 0);
}
}
@@ -6500,7 +6290,6 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl,
&& ((struct map_session_data *) bl)->
special_state.no_magic_damage)
heal = 0; /* 黄金蟲カード(ヒール量0) */
- clif_skill_nodamage(&src->bl, bl, AL_HEAL, heal, 1);
battle_heal(NULL, bl, heal, 0, 0);
}
else
@@ -6648,7 +6437,6 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl,
clif_fixmobpos((struct mob_data *) bl);
else
clif_fixpos(bl);
- clif_01ac(&src->bl);
sg->limit = DIFF_TICK(tick, sg->tick) + sec;
sg->val2 = bl->id;
}
@@ -6820,7 +6608,6 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl,
break;
if (sg->val2 == 0)
{
- clif_talkiebox(&src->bl, sg->valstr);
sg->unit_id = 0x8c;
clif_changelook(&src->bl, LOOK_BASE, sg->unit_id);
sg->limit = DIFF_TICK(tick, sg->tick) + 5000;
@@ -6851,7 +6638,6 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl,
clif_fixmobpos((struct mob_data *) bl);
else
clif_fixpos(bl);
- clif_01ac(&src->bl);
sg->limit =
DIFF_TICK(tick,
sg->tick) + skill_get_time2(sg->skill_id,
@@ -7102,8 +6888,6 @@ int skill_unit_onlimit(struct skill_unit *src, unsigned int)
case 0x8d: /* アイスウォール */
map_setcell(src->bl.m, src->bl.x, src->bl.y, src->val2);
- clif_changemapcell(src->bl.m, src->bl.x, src->bl.y, src->val2,
- 1);
break;
case 0xb2: /* あなたに会いたい */
{
@@ -7471,7 +7255,6 @@ void skill_check_condition_use_sub(struct block_list *bl, struct block_list *src
)
{
ssd->sc_data[SC_DANCING].val4 = bl->id;
- clif_skill_nodamage(bl, src, skillid, skilllv, 1);
skill_status_change_start(bl, SC_DANCING, uint16_t(skillid),
ssd->sc_data[SC_DANCING].val2, 0,
src->id, skill_get_time(skillid,
@@ -7631,10 +7414,7 @@ int skill_check_condition(struct map_session_data *sd, int type)
case AL_TELEPORT:
case AL_WARP:
if (map[sd->bl.m].flag.noteleport)
- {
- clif_skill_teleportmessage(sd, 0);
return 0;
- }
break;
case MO_CALLSPIRITS: /* 気功 */
if (sd->spiritball >= lv)
@@ -8379,8 +8159,6 @@ int skill_use_id(struct map_session_data *sd, int target_id,
if (casttime > 0 || forcecast)
{ /* 詠唱が必要 */
struct mob_data *md;
- clif_skillcasting(&sd->bl,
- sd->bl.id, target_id, 0, 0, skill_num, casttime);
/* 詠唱反応モンスター */
if (bl->type == BL_MOB && (md = (struct mob_data *) bl)
@@ -8511,11 +8289,6 @@ int skill_use_pos(struct map_session_data *sd,
skill_status_change_end(&sd->bl, SC_MEMORIZE, -1);
}
- if (casttime > 0) /* 詠唱が必要 */
- clif_skillcasting(&sd->bl,
- sd->bl.id, 0, skill_x, skill_y, skill_num,
- casttime);
-
if (casttime <= 0) /* 詠唱の無いものはキャンセルされない */
sd->state.skillcastcancel = 0;
@@ -8829,7 +8602,6 @@ int skill_devotion3(struct block_list *bl, int target)
for (n = 0; n < 5; n++)
if (md->dev.val1[n] == target)
md->dev.val2[n] = 0; // 離れた時は、糸を切るだけ
- clif_devotion(md, sd->bl.id);
return 1;
}
return 0;
@@ -8849,7 +8621,6 @@ void skill_devotion_end(struct map_session_data *md,
sd->sc_data[SC_DEVOTION].val1 = 0;
sd->sc_data[SC_DEVOTION].val2 = 0;
clif_status_change(&sd->bl, SC_DEVOTION, 0);
- clif_devotion(md, sd->bl.id);
}
}
@@ -9042,7 +8813,6 @@ void skill_idun_heal(struct block_list *bl, struct skill_unit *unit)
if (bl->type == BL_PC || bl->type == BL_MOB)
{
- clif_skill_nodamage(&unit->bl, bl, AL_HEAL, heal, 1);
battle_heal(NULL, bl, heal, 0, 0);
}
}
@@ -9296,10 +9066,6 @@ int skill_status_change_end(struct block_list *bl, StatusChange type, int tid)
sc_data[type].val4, SC_BLADESTOP,
-1);
- if (sc_data[type].val2 == 2)
- clif_bladestop((struct block_list *) sc_data[type].val3,
- (struct block_list *) sc_data[type].val4,
- 0);
}
break;
case SC_DANCING:
@@ -9325,15 +9091,6 @@ int skill_status_change_end(struct block_list *bl, StatusChange type, int tid)
}
break;
case SC_NOCHAT: //チャット禁止状態
- {
- struct map_session_data *sd = NULL;
- if (bl->type == BL_PC
- && (sd = (struct map_session_data *) bl))
- {
- sd->status.manner = 0;
- clif_updatestatus(sd, SP_MANNER);
- }
- }
break;
case SC_SPLASHER: /* ベナムスプラッシャー */
{
@@ -9940,7 +9697,6 @@ void skill_status_change_timer(timer_id tid, tick_t tick, custom_id_t id, custom
&& time(&timer) <
((sc_data[type].val2) + 60 * (0 - sd->status.manner)))
{ //開始からstatus.manner分経ってないので継続
- clif_updatestatus(sd, SP_MANNER);
sc_data[type].timer = add_timer( /* タイマー再設定(60秒) */
60000 + tick,
skill_status_change_timer,
@@ -10364,9 +10120,6 @@ int skill_status_effect(struct block_list *bl, StatusChange type,
case SC_BLADESTOP_WAIT: /* 白刃取り(待ち) */
break;
case SC_BLADESTOP: /* 白刃取り */
- if (val2 == 2)
- clif_bladestop((struct block_list *) val3,
- (struct block_list *) val4, 1);
*opt3 |= Opt3::_bladestop;
break;
@@ -10499,12 +10252,10 @@ int skill_status_effect(struct block_list *bl, StatusChange type,
tick = 60000;
if (!val2)
val2 = time(&timer);
- updateflag = SP_MANNER;
+ // updateflag = SP_MANNER;
}
break;
case SC_SELFDESTRUCTION: //自爆
- clif_skillcasting(bl, bl->id, bl->id, 0, 0, DC_FORTUNEKISS,
- skill_get_time(SkillID(val2), val1));
val3 = tick / 1000;
tick = 1000;
break;
@@ -11105,7 +10856,6 @@ struct skill_unit *skill_initunit(struct skill_unit_group *group, int idx,
unit->alive = 1;
map_addblock(&unit->bl);
- clif_skill_setunit(unit);
return unit;
}
@@ -11134,8 +10884,6 @@ int skill_delunit(struct skill_unit *unit)
unit->bl.m, unit->bl.x - range, unit->bl.y - range,
unit->bl.x + range, unit->bl.y + range, 0);
- clif_skill_delunit(unit);
-
unit->group = NULL;
unit->alive = 0;
map_delobjectnofree(unit->bl.id, BL_SKILL);
@@ -11701,7 +11449,6 @@ int skill_unit_move_unit_group(struct skill_unit_group *group, int m, int dx,
unit->bl.x += dx;
unit->bl.y += dy;
map_addblock(&unit->bl);
- clif_skill_setunit(unit);
if (range > 0)
{
if (range < 7)
@@ -11762,7 +11509,6 @@ int skill_unit_move_unit_group(struct skill_unit_group *group, int m, int dx,
unit1->bl.x += dx;
unit1->bl.y += dy;
map_addblock(&unit1->bl);
- clif_skill_setunit(unit1);
if (range > 0)
{
if (range < 7)
@@ -11789,7 +11535,6 @@ int skill_unit_move_unit_group(struct skill_unit_group *group, int m, int dx,
unit2->bl.y = unit1->bl.y + dy;
unit2->range = unit1->range;
map_addblock(&unit2->bl);
- clif_skill_setunit(unit2);
if (range > 0)
{
if (range < 7)