Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated doc/packet_interserv.txt

Browse Source 
* Added `skill_dummy2skill_id` in `battle_skill_damage`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
This commit is contained in:
Cydh Ramdh 2015-09-13 08:10:59 +07:00
parent 36d290b6fc
commit b0f4595688
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doc/packet_interserv.txt
View File

@ -249,7 +249,7 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
0x2728: 0x2728:
Type: HA 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 index: 0,2,4,8,13
len: variable (reg size+4) len: variable (reg size+4)
parameter: parameter:
@ -257,8 +257,11 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
- len: pakcet size - len: pakcet size
- aid: account identification - aid: account identification
- cid : char identification - cid : char identification
- str : name of variable in registry - keyLength
- value : value of varaible in registry - key
- index
- type
- value
desc: desc:
- Receive an request to fetch account_reg2 from a char-server, see packet 0x3004 (mapif_parse_Registry) - 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 - Parse whisper to GM
0x3804 0x3804
Type: IZ Type: AH
Structure: <cmd>.W <?>.W <aid>.L <cid>.L <type>.B 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 index: 0,2,4,8,12,13,14,16,...
len: variable: 13 or p (Max=5013) len: variable: 13 or p (Max=5013)
parameter: parameter:
- cmd : packet identification (0x3804) - cmd : packet identification (0x3804)
@ -1448,6 +1451,12 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
- aid - aid
- cid - cid
- type - type
- count
- keyLength
- key
- index
- val
- valLength
desc: desc:
- Account registry transfer to map-server - Account registry transfer to map-server

1
src/map/battle.c
View File

@ -2129,6 +2129,7 @@ static int battle_skill_damage(struct block_list *src, struct block_list *target
nullpo_ret(src); nullpo_ret(src);
if (!target || !skill_id) if (!target || !skill_id)
return 0; 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); return battle_skill_damage_skill(src, target, skill_id) + battle_skill_damage_map(src, target, skill_id);
} }
#endif #endif