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

- Fixed bugreport:9146, wrong message for msg 380. Thank Napster

Browse Source 
- Changed Monster, Mercenary, & Elemental defense element check, from %10 to %20, to support 10 custom elements. Thank @Atemo
- Updated some arrays in ACMD_FUNC(mobinfo)
- Removed element number limit for each level in db/[pre-]re/attr_fix.txt
- Allowing 'getitembound' and 'getitembound2' to put bound type 0 (no bound) for scripting easier
- Updated doc/mob_db.txt, follow up ca4a0ea
- Updated map_msg_idn.conf

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
This commit is contained in:
Cydh Ramdh
2014-07-19 13:50:46 +07:00
parent ca4a0ea1a2
commit 2bfe1d6f6e
15 changed files with 238 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/map/script.c
View File

@@ -6466,6 +6466,7 @@ BUILDIN_FUNC(checkweight2){
* getitembound <item id>,<amount>,<type>{,<account ID>};
* getitembound "<item id>",<amount>,<type>{,<account ID>};
* Type:
* 0 - No bound
* 1 - Account Bound
* 2 - Guild Bound
* 3 - Party Bound
@@ -6509,20 +6510,19 @@ BUILDIN_FUNC(getitem)
memset(&it,0,sizeof(it));
it.nameid = nameid;
it.identify = 1;
it.bound = BOUND_NONE;
if( !strcmp(command,"getitembound") ) {
char bound = script_getnum(st,4);
if( bound > BOUND_NONE && bound < BOUND_MAX ) {
it.bound = bound;
if( script_hasdata(st,5) )
sd = map_id2sd(script_getnum(st,5));
else
sd = script_rid2sd(st); // Attached player
}
else { //Not a correct bound type
if( bound < BOUND_NONE || bound >= BOUND_MAX ) {
ShowError("script_getitembound: Not a correct bound type! Type=%d\n",bound);
return SCRIPT_CMD_FAILURE;
}
if( script_hasdata(st,5) )
sd = map_id2sd(script_getnum(st,5));
else
sd = script_rid2sd(st); // Attached player
it.bound = bound;
} else if( script_hasdata(st,4) )
sd = map_id2sd(script_getnum(st,4)); // <Account ID>
else
@@ -6554,7 +6554,17 @@ BUILDIN_FUNC(getitem)
}
/*==========================================
* getitem2 <item id>,<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
* getitem2 "<item name>",<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
*
* getitembound2 <item id>,<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>,<bound type>{,<account ID>};
* getitembound2 "<item name>",<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>,<bound type>{,<account ID>};
* Type:
* 0 - No bound
* 1 - Account Bound
* 2 - Guild Bound
* 3 - Party Bound
* 4 - Character Bound
*------------------------------------------*/
BUILDIN_FUNC(getitem2)
{
@@ -6572,16 +6582,14 @@ BUILDIN_FUNC(getitem2)
if( !strcmp(command,"getitembound2") ) {
bound = script_getnum(st,11);
if( bound > BOUND_NONE && bound < BOUND_MAX ) {
if( script_hasdata(st,12) )
sd = map_id2sd(script_getnum(st,12));
else
sd = script_rid2sd(st); // Attached player
}
else {
if( bound < BOUND_NONE || bound >= BOUND_MAX ) {
ShowError("script_getitembound2: Not a correct bound type! Type=%d\n",bound);
return SCRIPT_CMD_FAILURE;
}
if( script_hasdata(st,12) )
sd = map_id2sd(script_getnum(st,12));
else
sd = script_rid2sd(st); // Attached player
} else if( script_hasdata(st,11) )
sd = map_id2sd(script_getnum(st,11)); // <Account ID>
else