summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-06-06 06:38:26 +0300
committerAndrei Karas <akaras@inbox.ru>2019-06-26 06:47:09 +0300
commitfebde8ebc5d4199ac66ab8aaa6ee42f497b37d87 (patch)
treef5303f4977d1efa6014a8b5fe8662b27f542807a
parent58e5437cc7611579155e6d47439becc418f9b51d (diff)
downloadhercules-febde8ebc5d4199ac66ab8aaa6ee42f497b37d87.tar.gz
hercules-febde8ebc5d4199ac66ab8aaa6ee42f497b37d87.tar.bz2
hercules-febde8ebc5d4199ac66ab8aaa6ee42f497b37d87.tar.xz
hercules-febde8ebc5d4199ac66ab8aaa6ee42f497b37d87.zip
Update packet ZC_PROPERTY_HOMUN
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/packets_struct.h30
2 files changed, 31 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 4b80942e8..9976fc744 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1649,7 +1649,9 @@ static void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int
p.level = hd->homunculus.level;
p.hunger = hd->homunculus.hunger;
p.intimacy = hd->homunculus.intimacy / 100;
+#if !(PACKETVER_MAIN_NUM >= 20190619 || PACKETVER_RE_NUM >= 20190605 || PACKETVER_ZERO_NUM >= 20190626)
p.itemId = 0; // equip id
+#endif
#ifdef RENEWAL
p.atk2 = cap_value(hstatus->rhw.atk2, 0, INT16_MAX);
#else
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index df8f009d6..1e4a17f62 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2326,7 +2326,35 @@ struct PACKET_ZC_ACK_WEAPONREFINE {
#endif
} __attribute__((packed));
-#if PACKETVER_MAIN_NUM >= 20131230 || PACKETVER_RE_NUM >= 20131230 || defined(PACKETVER_ZERO)
+#if PACKETVER_MAIN_NUM >= 20190619 || PACKETVER_RE_NUM >= 20190605 || PACKETVER_ZERO_NUM >= 20190626
+// PACKET_ZC_PROPERTY_HOMUN3
+struct PACKET_ZC_PROPERTY_HOMUN {
+ int16 packetType;
+ char name[NAME_LENGTH];
+ // Bit field, bit 0 : rename_flag (1 = already renamed), bit 1 : homunc vaporized (1 = true), bit 2 : homunc dead (1 = true)
+ uint8 flags;
+ uint16 level;
+ uint16 hunger;
+ uint16 intimacy;
+ uint16 atk2;
+ uint16 matk;
+ uint16 hit;
+ uint16 crit;
+ uint16 def;
+ uint16 mdef;
+ uint16 flee;
+ uint16 amotion;
+ uint32 hp;
+ uint32 maxHp;
+ uint16 sp;
+ uint16 maxSp;
+ uint32 exp;
+ uint32 expNext;
+ uint16 skillPoints;
+ uint16 range;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_PROPERTY_HOMUN, 0x0b2f);
+#elif PACKETVER_MAIN_NUM >= 20131230 || PACKETVER_RE_NUM >= 20131230 || defined(PACKETVER_ZERO)
// PACKET_ZC_PROPERTY_HOMUN2
struct PACKET_ZC_PROPERTY_HOMUN {
int16 packetType;