summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorreddozen <reddozen@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-24 23:13:37 +0000
committerreddozen <reddozen@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-24 23:13:37 +0000
commitea40b015cb26db701961714237380e2e64525ae7 (patch)
treeec0cfb1f98ea397c3bfd3f4f1d29bef001d72305 /src/map/pc.c
parent6677af13c59e6b643d561dcb17a45230e3b514fb (diff)
downloadhercules-ea40b015cb26db701961714237380e2e64525ae7.tar.gz
hercules-ea40b015cb26db701961714237380e2e64525ae7.tar.bz2
hercules-ea40b015cb26db701961714237380e2e64525ae7.tar.xz
hercules-ea40b015cb26db701961714237380e2e64525ae7.zip
* Fixed / finished most of Gunslinger [Reddozen]
- fixed some bullets in the item DB - adjusted a few rates in skill_cast_db.txt for Gunslingers - adjusted a couple skills in skill_db.txt to act correctly - adjusted all the SP values for Gunslinger skills - changed piercing shot to lv 5 from lv 10 - made ki Translation fail giving coins to Gunslingers - equipping a weapon other than a gatlin gun should cancel SC_GATLINGING. Also made Gatlinfeaver on/off togelable - GS_CRACKER will no longer stun players - added GS_Disarm * View changes here: http://diviniaro.com/data/reddozen_3_24_2006.patch git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5739 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 4063d97f0..75ce05530 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -595,6 +595,10 @@ int pc_isequip(struct map_session_data *sd,int n)
return 1;
}
}
+
+ if((item->equip & 0x0002 || item->equip & 0x0020) && item->type == 4 && sd->status.weapon != 20 && sd->sc.data[SC_GATLINGFEVER].timer != -1)
+ status_change_end(&sd->bl,SC_GATLINGFEVER,-1); // added to disable effects if new wepaon is not a Gatlin gun [Reddozen]
+
}
//Not equipable by class. [Skotlex]
if (!(1<<(sd->class_&MAPID_BASEMASK)&item->class_base[(sd->class_&JOBL_2_1)?1:((sd->class_&JOBL_2_2)?2:0)]))