diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 03:37:29 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 03:37:29 +0000 |
| commit | 11edd9bd6b905e1da203d49f0646cd9502536f1f (patch) | |
| tree | c11b95ae11ca3286e09b8ed54321d9e5f8abe5f4 /src/map/battle.c | |
| parent | e937166544b81130ba9c4336f69ad4cbd98614da (diff) | |
| download | hercules-11edd9bd6b905e1da203d49f0646cd9502536f1f.tar.gz hercules-11edd9bd6b905e1da203d49f0646cd9502536f1f.tar.bz2 hercules-11edd9bd6b905e1da203d49f0646cd9502536f1f.tar.xz hercules-11edd9bd6b905e1da203d49f0646cd9502536f1f.zip | |
* Made guild skills to check for skill levels first when casting
* Modified arrow checking in skill.c
* Corrected Cart Revolution damage calculation
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@549 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 7ff7e5348..d039ce032 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3226,8 +3226,8 @@ static struct Damage battle_calc_pc_weapon_attack( break; case MC_CARTREVOLUTION: // カートレボリューション if(sd->cart_max_weight > 0 && sd->cart_weight > 0) { - damage = ( damage*(150 + sd->cart_weight/80) )/100; //fixed CARTREV damage [Lupus] - damage2 = ( damage2*(150 + sd->cart_weight/80) )/100; + damage = ( damage*(150 + sd->cart_weight/800) )/100; //fixed CARTREV damage [Lupus] // should be 800, not 80... weight is *10 ^_- [celest] + damage2 = ( damage2*(150 + sd->cart_weight/800) )/100; //damage = (damage*(150 + pc_checkskill(sd,BS_WEAPONRESEARCH) + (sd->cart_weight*100/sd->cart_max_weight) ) )/100; //damage2 = (damage2*(150 + pc_checkskill(sd,BS_WEAPONRESEARCH) + (sd->cart_weight*100/sd->cart_max_weight) ) )/100; } |