diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-07 17:01:29 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-07 17:01:29 +0000 |
| commit | 6a2893723c01846d52cc2f333805c87469729f6c (patch) | |
| tree | fc3e6e0c0abf7ab37d7b5578531bc699360553cb /src/map/battle.c | |
| parent | bf5d35ffa62f9cc19f20f27fd5bd364f5fc13d7c (diff) | |
| download | hercules-6a2893723c01846d52cc2f333805c87469729f6c.tar.gz hercules-6a2893723c01846d52cc2f333805c87469729f6c.tar.bz2 hercules-6a2893723c01846d52cc2f333805c87469729f6c.tar.xz hercules-6a2893723c01846d52cc2f333805c87469729f6c.zip | |
Swapped the weapon type IDs of Shotgun and Gatling Gun weapons to match aegis.
Added Mace Mastery bonus to 2handed maces, and made them unbreakable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12779 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c767891a0..2be66abf4 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -654,6 +654,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int damage += (skill * 3); break; case W_MACE: + case W_2HMACE: if((skill = pc_checkskill(sd,PR_MACEMASTERY)) > 0) damage += (skill * 3); break; @@ -1237,8 +1238,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo switch(sd->status.weapon) { case W_BOW: case W_REVOLVER: - case W_SHOTGUN: case W_GATLING: + case W_SHOTGUN: case W_GRENADE: break; default: |