summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-05 08:00:53 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-05 08:00:53 +0000
commit27ef242114cf8cca770a1d50db6c3c0f997367f2 (patch)
treec365918ff7aabe2f426970f8d90ade2a9493ca0d /src/map/script.c
parent2d82d89f7405a977262e13de3f0985e7792cc9a7 (diff)
downloadhercules-27ef242114cf8cca770a1d50db6c3c0f997367f2.tar.gz
hercules-27ef242114cf8cca770a1d50db6c3c0f997367f2.tar.bz2
hercules-27ef242114cf8cca770a1d50db6c3c0f997367f2.tar.xz
hercules-27ef242114cf8cca770a1d50db6c3c0f997367f2.zip
* Set 'droprate0item''s default to 'yes'
* Look at item type other than item ID as well to check whether it is a card git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@911 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/map/script.c b/src/map/script.c
index dca1fbe12..22ae9f040 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5215,9 +5215,9 @@ int buildin_getequipcardcnt(struct script_state *st)
return 0;
}
do{
- if( (sd->status.inventory[i].card[c-1] > 4000) &&
- (sd->status.inventory[i].card[c-1] < 5000)){
-
+ if( (sd->status.inventory[i].card[c-1] > 4000 &&
+ sd->status.inventory[i].card[c-1] < 5000) ||
+ itemdb_type(sd->status.inventory[i].card[c-1]) == 6){ // [Celest]
push_val(st->stack,C_INT,(c));
return 0;
}
@@ -5244,8 +5244,9 @@ int buildin_successremovecards(struct script_state *st)
return 0;
}
do{
- if( (sd->status.inventory[i].card[c-1] > 4000) &&
- (sd->status.inventory[i].card[c-1] < 5000)){
+ if( (sd->status.inventory[i].card[c-1] > 4000 &&
+ sd->status.inventory[i].card[c-1] < 5000) ||
+ itemdb_type(sd->status.inventory[i].card[c-1]) == 6){ // [Celest]
cardflag = 1;
item_tmp.id=0,item_tmp.nameid=sd->status.inventory[i].card[c-1];
@@ -5297,8 +5298,9 @@ int buildin_failedremovecards(struct script_state *st)
return 0;
}
do{
- if(( sd->status.inventory[i].card[c-1] > 4000) &&
- (sd->status.inventory[i].card[c-1] < 5000)){
+ if( (sd->status.inventory[i].card[c-1] > 4000 &&
+ sd->status.inventory[i].card[c-1] < 5000) ||
+ itemdb_type(sd->status.inventory[i].card[c-1]) == 6){ // [Celest]
cardflag = 1;