summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 714770395..00d538f0b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/06/09
+ * Changed the interval between waterballs back to 125 [MasterOfMuppets]
* Fixed a typo in char_sql/char.c, thanks to Euph [MasterOfMuppets]
2006/06/08
* Modified guild exp to be an unsigned int rather than a signed one.
diff --git a/src/map/skill.c b/src/map/skill.c
index 48fa8958c..e504fcf99 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2297,7 +2297,7 @@ static int skill_timerskill (int tid, unsigned int tick, int id, int data)
if (!status_isdead(target))
skill_attack(BF_MAGIC,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag);
if (skl->type>1 && !status_isdead(target)) {
- skill_addtimerskill(src,tick+250,target->id,0,0,skl->skill_id,skl->skill_lv,skl->type-1,skl->flag);
+ skill_addtimerskill(src,tick+125,target->id,0,0,skl->skill_id,skl->skill_lv,skl->type-1,skl->flag);
} else {
struct status_change *sc = status_get_sc(src);
if(sc && sc->data[SC_MAGICPOWER].timer != -1)
@@ -2816,7 +2816,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
}
cnt--;
if (cnt > 0)
- skill_addtimerskill(src,tick+250,bl->id,0,0,
+ skill_addtimerskill(src,tick+125,bl->id,0,0,
skillid,skilllv,cnt,flag);
} else if (sd) //Eat up deluge tiles.
skill_count_water(src,0);