소스 검색

- 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://svn.code.sf.net/p/rathena/svn/trunk@11870 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 17 년 전
부모
커밋
9ca2a6c0dd
4개의 변경된 파일3개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      db/skill_cast_db.txt
  2. 0 2
      src/map/skill.c
  3. 1 1
      src/map/status.c
  4. 1 1
      src/map/unit.c

+ 1 - 1
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
 //==========================================

+ 0 - 2
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]

+ 1 - 1
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++;
 	}

+ 1 - 1
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
 			))