diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-26 13:47:01 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-26 13:47:01 +0000 |
| commit | 0fcfb97f9aab16e782440a9f785dba45e89213d4 (patch) | |
| tree | 1d0ef7139d9fdc002cadfaac407bbabed478a14d /src | |
| parent | b6217a50d072c2f2dd9f127ef95b24216bd1dff6 (diff) | |
| download | hercules-0fcfb97f9aab16e782440a9f785dba45e89213d4.tar.gz hercules-0fcfb97f9aab16e782440a9f785dba45e89213d4.tar.bz2 hercules-0fcfb97f9aab16e782440a9f785dba45e89213d4.tar.xz hercules-0fcfb97f9aab16e782440a9f785dba45e89213d4.zip | |
- Autospells will now again check for the skill's nk value, so that skills tagged "nodamage" skills will not trigger autospells.
- A bit of cleaning in pc_equippoint
- Corrected clif_item_sub so that pet eggs will correctly be sent as equipment (fixes them showing up "broken" and with random refine levels)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7341 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 9994de65e..2527ffebe 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2217,7 +2217,7 @@ void clif_item_sub(unsigned char *buf, int n, struct item *i, struct item_data * WBUFW(buf,n)=i->nameid;
WBUFB(buf,n+2)=itemtype(id->type);
WBUFB(buf,n+3)=i->identify;
- if (equip > 0) { //Equippable item.
+ if (equip > 0 || id->type == 7) { //Equippable item (pet eggs also count).
WBUFW(buf,n+4)=equip;
WBUFW(buf,n+6)=i->equip;
WBUFB(buf,n+8)=i->attribute;
diff --git a/src/map/pc.c b/src/map/pc.c index 030c174bc..417aab16f 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -390,7 +390,9 @@ int pc_equippoint(struct map_session_data *sd,int n) if(sd->inventory_data[n]) {
ep = sd->inventory_data[n]->equip;
- if(sd->inventory_data[n]->look == 1 || sd->inventory_data[n]->look == 2 || sd->inventory_data[n]->look == 6) {
+ if(sd->inventory_data[n]->look == W_DAGGER ||
+ sd->inventory_data[n]->look == W_1HSWORD ||
+ sd->inventory_data[n]->look == W_1HAXE) {
if(ep == 2 && (pc_checkskill(sd,AS_LEFT) > 0 || (sd->class_&MAPID_UPPERMASK) == MAPID_ASSASSIN))
return 34;
}
diff --git a/src/map/skill.c b/src/map/skill.c index f787bf5fd..a849e55b2 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1336,10 +1336,8 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int } //Reports say that autospell effects get triggered on skills and pretty much everything including splash attacks. [Skotlex] - //No need to check the NK value as this function is only called on attacks - //(or stuff that should invoke these things. - if(sd && !status_isdead(bl) && src != bl/* && - !(skillid && skill_get_nk(skillid)&NK_NO_DAMAGE)*/) { + if(sd && !status_isdead(bl) && src != bl && + !(skillid && skill_get_nk(skillid)&NK_NO_DAMAGE)) { struct block_list *tbl; struct unit_data *ud; int i, skilllv; |