From 36d290b6fc7ff966ea08eca9112cb52dcdc2b935 Mon Sep 17 00:00:00 2001 From: nanakiwurtz Date: Sun, 13 Sep 2015 03:11:01 +0700 Subject: [PATCH 1/2] Item DB Update * Added Zombie Guard Card (4641) Signed-off-by: nanakiwurtz --- db/re/item_db.txt | 1 + sql-files/item_db_re.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/db/re/item_db.txt b/db/re/item_db.txt index ef628aedd8..6faee9ca59 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -2726,6 +2726,7 @@ 4638,Watcher_Card,Watcher Card,6,20,,10,,,,,,,,16,,,,,{ bonus bBaseAtk,30; bonus bSPDrainValue,-5; },{},{} 4639,Taffy_Card,Taffy Card,6,20,,10,,,,,,,,136,,,,,{ bonus bAtkRate,1; },{},{} 4640,Frozen_Wolf_Card,Frozen Wolf Card,6,20,,10,,,,,,,,136,,,,,{ bonus bMatkRate,1; },{},{} +4641,Zombie_Guard_Card,Zombie Guard Card,6,20,,10,,,,,,,,32,,,,,{ bonus bNoRegen,2; bonus bSPDrainValue,1; },{},{} //=================================================================== // Armor Enchant System //=================================================================== diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 84494afc88..11bc2c6da8 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -2757,6 +2757,7 @@ REPLACE INTO `item_db_re` VALUES (4637,'Immortal_Corps_Card','Immortal Corps Car REPLACE INTO `item_db_re` VALUES (4638,'Watcher_Card','Watcher Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bBaseAtk,30; bonus bSPDrainValue,-5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (4639,'Taffy_Card','Taffy Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus bAtkRate,1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (4640,'Frozen_Wolf_Card','Frozen Wolf Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus bMatkRate,1;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (4641,'Zombie_Guard_Card','Zombie Guard Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus bNoRegen,2; bonus bSPDrainValue,1;',NULL,NULL); #=================================================================== # Armor Enchant System #=================================================================== From b0f459568840604af5b0ec07450a66a815d528df Mon Sep 17 00:00:00 2001 From: Cydh Ramdh Date: Sun, 13 Sep 2015 08:10:59 +0700 Subject: [PATCH 2/2] * Updated doc/packet_interserv.txt * Added `skill_dummy2skill_id` in `battle_skill_damage` Signed-off-by: Cydh Ramdh --- doc/packet_interserv.txt | 21 +++++++++++++++------ src/map/battle.c | 1 + 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/packet_interserv.txt b/doc/packet_interserv.txt index ed24145440..916c23b7a2 100644 --- a/doc/packet_interserv.txt +++ b/doc/packet_interserv.txt @@ -249,7 +249,7 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket. 0x2728: Type: HA - Structure: .W .W .L .L { .?B .?B } + Structure: .W .W .L .L { .B . .L .B .?B } index: 0,2,4,8,13 len: variable (reg size+4) parameter: @@ -257,8 +257,11 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket. - len: pakcet size - aid: account identification - cid : char identification - - str : name of variable in registry - - value : value of varaible in registry + - keyLength + - key + - index + - type + - value desc: - Receive an request to fetch account_reg2 from a char-server, see packet 0x3004 (mapif_parse_Registry) @@ -1438,9 +1441,9 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket. - Parse whisper to GM 0x3804 - Type: IZ - Structure: .W .W .L .L .B - index: 0,2,4,8,12 + Type: AH + Structure: .W .W .L .L .B .B .W { .B . .L .B . }* + index: 0,2,4,8,12,13,14,16,... len: variable: 13 or p (Max=5013) parameter: - cmd : packet identification (0x3804) @@ -1448,6 +1451,12 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket. - aid - cid - type + - count + - keyLength + - key + - index + - val + - valLength desc: - Account registry transfer to map-server diff --git a/src/map/battle.c b/src/map/battle.c index f791f2c40e..7eb7439112 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2129,6 +2129,7 @@ static int battle_skill_damage(struct block_list *src, struct block_list *target nullpo_ret(src); if (!target || !skill_id) return 0; + skill_id = skill_dummy2skill_id(skill_id); return battle_skill_damage_skill(src, target, skill_id) + battle_skill_damage_map(src, target, skill_id); } #endif