diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-02 14:55:14 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-02 14:55:14 +0000 |
| commit | 187b83fe68d75e457d3fd1aa2af32ddc2005d036 (patch) | |
| tree | d6fdf004f5755ab192624282b98104eea35316b4 /src/map/status.c | |
| parent | 24fd0a33070755eeb6cc25f442716fa0dddf159a (diff) | |
| download | hercules-187b83fe68d75e457d3fd1aa2af32ddc2005d036.tar.gz hercules-187b83fe68d75e457d3fd1aa2af32ddc2005d036.tar.bz2 hercules-187b83fe68d75e457d3fd1aa2af32ddc2005d036.tar.xz hercules-187b83fe68d75e457d3fd1aa2af32ddc2005d036.zip | |
- Recoded the GuildAura code to use val3 & val4, allowing much greater stat bonuses (in case someone wants to get Guild Skill level 20 or something crazy like that)
- Fixed compilation error...
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8053 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/status.c b/src/map/status.c index 437be3cdf..8ac13bb3a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2916,8 +2916,8 @@ static unsigned short status_calc_str(struct block_list *bl, struct status_chang str += sc->data[SC_STRFOOD].val1; if(sc->data[SC_BATTLEORDERS].timer!=-1) str += 5; - if(sc->data[SC_GUILDAURA].timer != -1 && ((sc->data[SC_GUILDAURA].val4>>12)&0xF)) - str += (sc->data[SC_GUILDAURA].val4>>12)&0xF; + if(sc->data[SC_GUILDAURA].timer != -1 && sc->data[SC_GUILDAURA].val3>>16) + str += sc->data[SC_GUILDAURA].val3>>16; if(sc->data[SC_LOUD].timer!=-1) str += 4; if(sc->data[SC_TRUESIGHT].timer!=-1) @@ -2957,8 +2957,8 @@ static unsigned short status_calc_agi(struct block_list *bl, struct status_chang agi += sc->data[SC_INCAGI].val1; if(sc->data[SC_AGIFOOD].timer!=-1) agi += sc->data[SC_AGIFOOD].val1; - if(sc->data[SC_GUILDAURA].timer != -1 && ((sc->data[SC_GUILDAURA].val4>>4)&0xF)) - agi += (sc->data[SC_GUILDAURA].val4>>4)&0xF; + if(sc->data[SC_GUILDAURA].timer != -1 && sc->data[SC_GUILDAURA].val4>>16) + agi += sc->data[SC_GUILDAURA].val4>>16; if(sc->data[SC_TRUESIGHT].timer!=-1) agi += 5; if(sc->data[SC_INCREASEAGI].timer!=-1) @@ -2992,8 +2992,8 @@ static unsigned short status_calc_vit(struct block_list *bl, struct status_chang vit += sc->data[SC_INCVIT].val1; if(sc->data[SC_VITFOOD].timer!=-1) vit += sc->data[SC_VITFOOD].val1; - if(sc->data[SC_GUILDAURA].timer != -1 && ((sc->data[SC_GUILDAURA].val4>>8)&0xF)) - vit += (sc->data[SC_GUILDAURA].val4>>8)&0xF; + if(sc->data[SC_GUILDAURA].timer != -1 && sc->data[SC_GUILDAURA].val3&0xFFFF) + vit += sc->data[SC_GUILDAURA].val3&0xFFFF; if(sc->data[SC_TRUESIGHT].timer!=-1) vit += 5; if(sc->data[SC_STRIPARMOR].timer!=-1) @@ -3063,8 +3063,8 @@ static unsigned short status_calc_dex(struct block_list *bl, struct status_chang dex += sc->data[SC_DEXFOOD].val1; if(sc->data[SC_BATTLEORDERS].timer!=-1) dex += 5; - if(sc->data[SC_GUILDAURA].timer != -1 && (sc->data[SC_GUILDAURA].val4&0xF)) - dex += sc->data[SC_GUILDAURA].val4&0xF; + if(sc->data[SC_GUILDAURA].timer != -1 && sc->data[SC_GUILDAURA].val4&0xFFFF) + dex += sc->data[SC_GUILDAURA].val4&0xFFFF; if(sc->data[SC_TRUESIGHT].timer!=-1) dex += 5; if(sc->data[SC_QUAGMIRE].timer!=-1) |