diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-11 16:32:37 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-11 16:32:37 +0000 |
commit | 6749d6567aa972b5cc46e1ed85986be21e2ec799 (patch) | |
tree | 4d28fd94577ad9183c9341f71fd961931faba416 /src/map/status.c | |
parent | 1e844abc3fa269a504ba6610ac83224d9660ce22 (diff) | |
download | hercules-6749d6567aa972b5cc46e1ed85986be21e2ec799.tar.gz hercules-6749d6567aa972b5cc46e1ed85986be21e2ec799.tar.bz2 hercules-6749d6567aa972b5cc46e1ed85986be21e2ec799.tar.xz hercules-6749d6567aa972b5cc46e1ed85986be21e2ec799.zip |
- Coded @reset.
- Reenabled @changesex
- Added function pet_create_egg which handles creating pet eggs correctly (when passed item id is indeed a valid petegg). Applied this on @createitem and getitem.
- Cleaned up code of @item
- Added define UNKNOWN_ITEM_ID (512 = apple)
- Added IT_* enumation item_Types to identify said data from items.
- Cleaned up the itemdb_isequip functions. itemdb_isequip will now return if the item is equipable by players, itemdb_isstackable returns if the item can be stacked, and itemdb_isidentified returns if the item should drop identified.
- Added defines CARD0_PET/CARD0_FORGE/CARD0_CREATED to identify if a given item has "invalid" cards, added define function itemdb_isspecial to simplify this check.
- Removed itemdb.c considering item ids above 20000 as invalid.
- Cleaned up script commands getitem and card-counting related ones.
- Cleaned up a bit more pc_isequip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7613 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r-- | src/map/status.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index bb928def5..b3a77dadf 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1721,7 +1721,7 @@ int status_calc_pc(struct map_session_data* sd,int first) return 1; } - if(sd->status.inventory[index].card[0]==0x00ff) + if(sd->status.inventory[index].card[0]==CARD0_FORGE) { // Forged weapon wd->star += (sd->status.inventory[index].card[1]>>8); if(wd->star >= 15) wd->star = 40; // 3 Star Crumbs now give +40 dmg @@ -1777,9 +1777,7 @@ int status_calc_pc(struct map_session_data* sd,int first) struct item_data *data; //Card script execution. - if(sd->status.inventory[index].card[0]==0x00ff || - sd->status.inventory[index].card[0]==0x00fe || - sd->status.inventory[index].card[0]==(short)0xff00) + if(itemdb_isspecial(sd->status.inventory[index].card[0])) continue; for(j=0;j<sd->inventory_data[index]->slot;j++){ current_equip_card_id= c= sd->status.inventory[index].card[j]; |