summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-08 17:09:24 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-08 17:09:24 +0000
commite6ddd96c260fe3372cb266d3d59e07ab86769ed7 (patch)
tree8a31df021e8af2e5aa3e74112711269aef3a3835
parent2a31e8561e18bff403cef8c406e475ff4e7f630d (diff)
downloadhercules-e6ddd96c260fe3372cb266d3d59e07ab86769ed7.tar.gz
hercules-e6ddd96c260fe3372cb266d3d59e07ab86769ed7.tar.bz2
hercules-e6ddd96c260fe3372cb266d3d59e07ab86769ed7.tar.xz
hercules-e6ddd96c260fe3372cb266d3d59e07ab86769ed7.zip
- Changed the chaotic delay from block to delay since it just a sec
- Fixed the longing for freedom check in unit_can_move - Corrected a check while parsing refine_db.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11870 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/skill_cast_db.txt2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c2
-rw-r--r--src/map/unit.c2
4 files changed, 3 insertions, 5 deletions
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 1b994546c..b6bc45361 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -1025,7 +1025,7 @@
//-- HVAN_CAPRICE
8013,0,1000:1200:1400:1600:1800,0,0,0
//-- HVAN_CHAOTIC
-8014,0,0,1000,0,1000
+8014,0,1000,1000,0,0
//-- HVAN_EXPLOSION
8016,0,0,1000,0,0
//==========================================
diff --git a/src/map/skill.c b/src/map/skill.c
index 27a2882b3..cc45546a6 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5082,8 +5082,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
clif_skill_nodamage(src,bl,AL_HEAL,i,1);
clif_skill_nodamage(src,bl,skillid,i,1);
status_heal(bl, i, 0, 0);
- if (hd)
- skill_blockmerc_start(hd, skillid, skill_get_time2(skillid,skilllv)) ;
}
break;
//Homun single-target support skills [orn]
diff --git a/src/map/status.c b/src/map/status.c
index 2d6b3301e..1dc109b7f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -7453,7 +7453,7 @@ int status_readdb(void)
refinebonus[i][0]=atoi(split[0]); // 精?ボ?ナス
refinebonus[i][1]=atoi(split[1]); // 過?精?ボ?ナス
refinebonus[i][2]=atoi(split[2]); // 安全精?限界
- for(j=0;j<MAX_REFINE && split[j];j++)
+ for(j=0;j<MAX_REFINE && split[j+3];j++)
percentrefinery[i][j]=atoi(split[j+3]);
i++;
}
diff --git a/src/map/unit.c b/src/map/unit.c
index 5603c1ff0..cd834524a 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -731,7 +731,7 @@ int unit_can_move(struct block_list *bl)
|| sc->data[SC_BLADESTOP_WAIT]
|| sc->data[SC_SPIDERWEB]
|| (sc->data[SC_DANCING] && sc->data[SC_DANCING]->val4 && (
- sc->data[SC_LONGING] ||
+ !sc->data[SC_LONGING] ||
(sc->data[SC_DANCING]->val1&0xFFFF) == CG_MOONLIT ||
(sc->data[SC_DANCING]->val1&0xFFFF) == CG_HERMODE
))