diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-09-16 22:20:30 +0200 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-09-16 22:20:30 +0200 |
| commit | 8ab61745b81d1cf0602c7998f590aac8749187da (patch) | |
| tree | aa21f15ade1aa219a2b092b901e6e349abe3d713 | |
| parent | 219c35e699b03da7939c207627c09a70614a1b7b (diff) | |
| download | hercules-8ab61745b81d1cf0602c7998f590aac8749187da.tar.gz hercules-8ab61745b81d1cf0602c7998f590aac8749187da.tar.bz2 hercules-8ab61745b81d1cf0602c7998f590aac8749187da.tar.xz hercules-8ab61745b81d1cf0602c7998f590aac8749187da.zip | |
Follow rev: https://github.com/HerculesWS/Hercules/commit/0a24a4bb6340459a6128c39d13ab1bf37a5bc6b8
Fix bug: 7891: http://hercules.ws/board/tracker/issue-7891-estin-estun-breakfall-and-kick-stance/
| -rw-r--r-- | db/const.txt | 4 | ||||
| -rw-r--r-- | src/map/battle.c | 18 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/db/const.txt b/db/const.txt index 8023fc30f..858fd868e 100644 --- a/db/const.txt +++ b/db/const.txt @@ -679,8 +679,8 @@ RC2_Golem 4 RC2_Guardian 5 RC2_Ninja 6 -Size_Small 0 -Size_Medium 1 +Size_Medium 0 +Size_Small 1 Size_Large 2 BF_WEAPON 0x0001 diff --git a/src/map/battle.c b/src/map/battle.c index fbc166874..4dc1dc0e4 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -776,18 +776,18 @@ int64 battle_calc_masteryfix(struct block_list *src, struct block_list *target, if(sc->data[SC_IMPOSITIO]) damage += sc->data[SC_IMPOSITIO]->val2; if(sc->data[SC_DRUMBATTLE]){ - if(tstatus->size == SZ_MEDIUM) + if(tstatus->size == SZ_SMALL) damage += sc->data[SC_DRUMBATTLE]->val2; - else if(tstatus->size == SZ_SMALL) + else if(tstatus->size == SZ_MEDIUM) damage += 10 * sc->data[SC_DRUMBATTLE]->val1; //else no bonus for large target } if(sc->data[SC_GS_MADNESSCANCEL]) damage += 100; if(sc->data[SC_GS_GATLINGFEVER]){ - if(tstatus->size == SZ_MEDIUM) + if(tstatus->size == SZ_SMALL) damage += 10 * sc->data[SC_GS_GATLINGFEVER]->val1; - else if(tstatus->size == SZ_SMALL) + else if(tstatus->size == SZ_MEDIUM) damage += -5 * sc->data[SC_GS_GATLINGFEVER]->val1; else damage += sc->data[SC_GS_GATLINGFEVER]->val1; @@ -2211,8 +2211,8 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block break; case NC_ARMSCANNON: switch( tst->size ) { - case SZ_MEDIUM: skillratio = 300 + 350 * skill_lv; break; // Medium - case SZ_SMALL: skillratio = 300 + 400 * skill_lv; break; // Small + case SZ_SMALL: skillratio = 300 + 350 * skill_lv; break; // Medium + case SZ_MEDIUM: skillratio = 300 + 400 * skill_lv; break; // Small case SZ_BIG: skillratio = 300 + 300 * skill_lv; break; // Large } RE_LVL_DMOD(120); @@ -4607,10 +4607,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list i*=i; ATK_ADD(i); //Add str bonus. switch (tstatus->size) { //Size-fix. Is this modified by weapon perfection? - case SZ_MEDIUM: //Medium: 125% + case SZ_SMALL: //Small: 125% ATK_RATE(125); break; - //case SZ_SMALL: //Medium: 100% + //case SZ_MEDIUM: //Medium: 100% case SZ_BIG: //Large: 75% ATK_RATE(75); break; @@ -4749,7 +4749,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list ATK_ADD(sd->inventory_data[index]->weight * 7 / 100); switch (tstatus->size) { - case SZ_MEDIUM: //Medium: 115% + case SZ_SMALL: //Small: 115% ATK_RATE(115); break; case SZ_BIG: //Large: 85% diff --git a/src/map/status.c b/src/map/status.c index e48b2931c..70a7fb2ce 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2470,7 +2470,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) { //Give them all modes except these (useful for clones) bstatus->mode = MD_MASK&~(MD_BOSS|MD_PLANT|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK); - bstatus->size = (sd->class_&JOBL_BABY)?SZ_MEDIUM:SZ_SMALL; + bstatus->size = (sd->class_&JOBL_BABY)?SZ_SMALL:SZ_MEDIUM; if (battle_config.character_size && (pc_isriding(sd) || pc_isridingdragon(sd)) ) { //[Lupus] if (sd->class_&JOBL_BABY) { if (battle_config.character_size&SZ_BIG) |