summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--db/skill_db.txt2
-rw-r--r--src/map/skill.c10
3 files changed, 10 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6e91aaaa8..001275b3a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2009/03/31
+ * Gunslinger Tracking can be canceled if you get hit.
+ * Gunslinger Disarm always shows skill animation.
+ * Removed custom firetrap effect from Gunslinger mines. [ultramage]
2009/03/27
* Fixed a problem that blockskill timer failed when there was more than one on a skill [Playtester]
- please test this, now Asura should be blocked 2 seconds after EVERY Snap
diff --git a/db/skill_db.txt b/db/skill_db.txt
index aee8d9bc4..55954e3ff 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -553,7 +553,7 @@
509,0,0,0,0,0,0,10,0,no,0,0,0,none,0, GS_SINGLEACTION,Single Action
510,0,0,0,0,0,0,10,0,no,0,0,0,none,0, GS_SNAKEEYE,Snake Eye
511,-9,8,0,-1,0,0,10,2,no,0,0,0,weapon,0, GS_CHAINACTION,Chain Action
-512,-9,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, GS_TRACKING,Tracking
+512,-9,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0, GS_TRACKING,Tracking
513,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, GS_DISARM,Disarm
514,-9,6,1,-1,0x20,0,5,1,no,0,0,0,weapon,0, GS_PIERCINGSHOT,Piercing Shot
515,-9,8,1,-1,0,0,10,5,no,0,0,0,weapon,0, GS_RAPIDSHOWER,Rapid Shower
diff --git a/src/map/skill.c b/src/map/skill.c
index 0e2f2ad4b..f82495350 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -830,9 +830,9 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
case GS_DISARM:
rate = 3*skilllv;
if (sstatus->dex > tstatus->dex)
- rate += (sstatus->dex - tstatus->dex)/5;
- if (skill_strip_equip(bl, EQP_WEAPON, rate, skilllv, skill_get_time(skillid,skilllv)))
- clif_skill_nodamage(src,bl,skillid,skilllv,1);
+ rate += (sstatus->dex - tstatus->dex)/5; //TODO: Made up formula
+ skill_strip_equip(bl, EQP_WEAPON, rate, skilllv, skill_get_time(skillid,skilllv));
+ clif_skill_nodamage(src,bl,skillid,skilllv,1);
break;
case NPC_EVILLAND:
sc_start(bl,SC_BLIND,5*skilllv,skilllv,skill_get_time2(skillid,skilllv));
@@ -7478,7 +7478,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
skill_get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag,
&src->bl,tick);
sg->unit_id = UNT_USED_TRAPS;
- clif_changetraplook(&src->bl, UNT_FIREPILLAR_ACTIVE);
+ //clif_changetraplook(&src->bl, UNT_FIREPILLAR_ACTIVE);
sg->limit=DIFF_TICK(tick,sg->tick)+1500;
break;
}
@@ -10048,7 +10048,7 @@ static int skill_unit_timer_sub (DBKey key, void* data, va_list ap)
case UNT_GROUNDDRIFT_WATER:
case UNT_GROUNDDRIFT_FIRE:
group->unit_id = UNT_USED_TRAPS;
- clif_changetraplook(bl, UNT_FIREPILLAR_ACTIVE);
+ //clif_changetraplook(bl, UNT_FIREPILLAR_ACTIVE);
group->limit=DIFF_TICK(tick+1500,group->tick);
unit->limit=DIFF_TICK(tick+1500,group->tick);
break;