summaryrefslogtreecommitdiff
path: root/src/emap
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-19 19:03:52 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-19 19:03:52 +0300
commite7f1290ab54d37ef72c97721cbb4f53a8ab56b86 (patch)
treea262fdafaeb8fc7c59d64964f170ed479e1356b5 /src/emap
parent9291a21bcbb974db25f1159608edf0e8c816eb02 (diff)
downloadevol-hercules-e7f1290ab54d37ef72c97721cbb4f53a8ab56b86.tar.gz
evol-hercules-e7f1290ab54d37ef72c97721cbb4f53a8ab56b86.tar.bz2
evol-hercules-e7f1290ab54d37ef72c97721cbb4f53a8ab56b86.tar.xz
evol-hercules-e7f1290ab54d37ef72c97721cbb4f53a8ab56b86.zip
Add inf2 into skill block packet.0x10f.
Increase plugin version to 15.
Diffstat (limited to 'src/emap')
-rw-r--r--src/emap/clif.c66
-rw-r--r--src/emap/clif.h1
-rw-r--r--src/emap/init.c1
3 files changed, 68 insertions, 0 deletions
diff --git a/src/emap/clif.c b/src/emap/clif.c
index e36127b..686cb08 100644
--- a/src/emap/clif.c
+++ b/src/emap/clif.c
@@ -1484,3 +1484,69 @@ void eclif_useskill(struct block_list* bl,
clif->send(buf, len, bl, AREA);
}
}
+
+void eclif_skillinfoblock_pre(struct map_session_data **sdPtr)
+{
+ struct map_session_data *sd = *sdPtr;
+ nullpo_retv(sd);
+ struct SessionExt *data = session_get_bysd(sd);
+ if (!data)
+ return;
+ if (data->clientVersion < 18)
+ return;
+
+ int fd = sd->fd;
+ if (!fd)
+ return;
+
+ WFIFOHEAD(fd, MAX_SKILL * 41 + 4);
+ WFIFOW(fd, 0) = 0x10f;
+ int len = 4;
+ int i;
+ for (i = 0; i < MAX_SKILL; i++)
+ {
+ int id = sd->status.skill[i].id;
+ if (id != 0)
+ {
+ const int skillSize = 41;
+ if (len + skillSize > 16384)
+ break;
+
+ WFIFOW(fd, len) = id;
+ WFIFOL(fd, len + 2) = skill->get_inf(id);
+ WFIFOL(fd, len + 6) = skill->get_inf2(id);
+ const int level = sd->status.skill[i].lv;
+ WFIFOW(fd, len + 10) = level;
+ if (level)
+ {
+ WFIFOW(fd, len + 12) = skill->get_sp(id, level);
+ WFIFOW(fd, len + 14) = skill->get_range2(&sd->bl, id, level);
+ }
+ else
+ {
+ WFIFOW(fd, len + 12) = 0;
+ WFIFOW(fd, len + 14) = 0;
+ }
+ safestrncpy(WFIFOP(fd, len + 16), skill->get_name(id), NAME_LENGTH);
+ if (sd->status.skill[i].flag == SKILL_FLAG_PERMANENT)
+ WFIFOB(fd, len + 40) = (sd->status.skill[i].lv < skill->tree_get_max(id, sd->status.class_)) ? 1 : 0;
+ else
+ WFIFOB(fd, len + 40) = 0;
+ len += skillSize;
+ }
+ }
+ WFIFOW(fd, 2) = len;
+ WFIFOSET(fd, len);
+
+ // workaround for bugreport:5348; send the remaining skills one by one to bypass packet size limit
+ for ( ; i < MAX_SKILL; i++)
+ {
+ int id = sd->status.skill[i].id;
+ if (id != 0)
+ {
+ clif->addskill(sd, id);
+ clif->skillinfo(sd, id, 0);
+ }
+ }
+ hookStop();
+}
diff --git a/src/emap/clif.h b/src/emap/clif.h
index 9d4b774..d1ce26f 100644
--- a/src/emap/clif.h
+++ b/src/emap/clif.h
@@ -93,5 +93,6 @@ void eclif_useskill(struct block_list* bl,
uint16 skill_id,
uint16 skill_lv,
int casttime);
+void eclif_skillinfoblock_pre(struct map_session_data **sdPtr);
#endif // EVOL_MAP_CLIF
diff --git a/src/emap/init.c b/src/emap/init.c
index 3c57019..ddb4c8e 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -228,6 +228,7 @@ HPExport void plugin_init (void)
addHookPre(clif, send_actual, eclif_send_actual_pre);
addHookPre(clif, pLoadEndAck, eclif_parse_LoadEndAck_pre);
addHookPre(clif, spawn_unit, eclif_spawn_unit_pre);
+ addHookPre(clif, skillinfoblock, eclif_skillinfoblock_pre);
addHookPre(itemdb, is_item_usable, eitemdb_is_item_usable_pre);
addHookPre(itemdb, readdb_additional_fields, eitemdb_readdb_additional_fields_pre);
addHookPre(itemdb, destroy_item_data, edestroy_item_data_pre);