summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-07 17:01:29 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-07 17:01:29 +0000
commit6a2893723c01846d52cc2f333805c87469729f6c (patch)
treefc3e6e0c0abf7ab37d7b5578531bc699360553cb /src
parentbf5d35ffa62f9cc19f20f27fd5bd364f5fc13d7c (diff)
downloadhercules-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')
-rw-r--r--src/map/battle.c3
-rw-r--r--src/map/pc.c8
-rw-r--r--src/map/pc.h6
-rw-r--r--src/map/skill.c1
-rw-r--r--src/map/status.c4
5 files changed, 12 insertions, 10 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:
diff --git a/src/map/pc.c b/src/map/pc.c
index 9c6f9686e..643863ea6 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -688,8 +688,8 @@ int pc_isequip(struct map_session_data *sd,int n)
case W_DAGGER: //Level 4 Knives are equippable.. this means all knives, I'd guess?
case W_1HSWORD: //All 1H swords
case W_1HAXE: //All 1H Axes
- case W_MACE: //All Maces
- case W_STAFF: //All Staffs
+ case W_MACE: //All 1H Maces
+ case W_STAFF: //All 1H Staves
return 1;
}
}
@@ -1576,8 +1576,8 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
case W_BOW:
case W_REVOLVER:
case W_RIFLE:
- case W_SHOTGUN:
case W_GATLING:
+ case W_SHOTGUN:
case W_GRENADE:
//Become weapon element.
status->rhw.ele=val;
@@ -1640,8 +1640,8 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
case W_BOW:
case W_REVOLVER:
case W_RIFLE:
- case W_SHOTGUN:
case W_GATLING:
+ case W_SHOTGUN:
case W_GRENADE:
status->rhw.range += val;
}
diff --git a/src/map/pc.h b/src/map/pc.h
index bd2baea96..0991d5150 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -378,7 +378,7 @@ enum weapon_type {
W_1HAXE, //6
W_2HAXE, //7
W_MACE, //8
- W_2HMACE, //9, unused?
+ W_2HMACE, //9 (unused)
W_STAFF, //10
W_BOW, //11
W_KNUCKLE, //12
@@ -388,8 +388,8 @@ enum weapon_type {
W_KATAR, //16
W_REVOLVER, //17
W_RIFLE, //18
- W_SHOTGUN, //19
- W_GATLING, //20
+ W_GATLING, //19
+ W_SHOTGUN, //20
W_GRENADE, //21
W_HUUMA, //22
MAX_WEAPON_TYPE,
diff --git a/src/map/skill.c b/src/map/skill.c
index 8bc055c2a..e752afb87 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1131,6 +1131,7 @@ int skill_break_equip (struct block_list *bl, unsigned short where, int rate, in
case W_1HAXE:
case W_2HAXE:
case W_MACE: // Axes and Maces can't be broken [DracoRPG]
+ case W_2HMACE:
case W_STAFF:
case W_BOOK: //Rods and Books can't be broken [Skotlex]
case W_HUUMA:
diff --git a/src/map/status.c b/src/map/status.c
index c25231625..e8df69b3f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1236,8 +1236,8 @@ static unsigned short status_base_atk(struct block_list *bl, struct status_data
case W_WHIP:
case W_REVOLVER:
case W_RIFLE:
- case W_SHOTGUN:
case W_GATLING:
+ case W_SHOTGUN:
case W_GRENADE:
flag = 1;
}
@@ -3852,8 +3852,8 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
case W_BOW:
case W_REVOLVER:
case W_RIFLE:
- case W_SHOTGUN:
case W_GATLING:
+ case W_SHOTGUN:
case W_GRENADE:
break;
default: