Merge branch 'master' of https://github.com/rathena/rathena

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
 //===================================================================

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: <cmd>.W <len>.W <aid>.L <cid>.L { <str>.?B <value>.?B }
+	Structure: <cmd>.W <len>.W <aid>.L <cid>.L { <keyLength>.B <key>.<keyLength> <index>.L <type>.B <value>.?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: <cmd>.W <?>.W <aid>.L <cid>.L <type>.B
-	index: 0,2,4,8,12
+	Type: AH
+	Structure: <cmd>.W <len>.W <aid>.L <cid>.L <?>.B <type>.B <count>.W { <keyLength>.B <key>.<keyLength> <index>.L <valLength>.B <val>.<valLength> }*
+	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
 

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
 #===================================================================

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