Jelajahi Sumber

- Some code cleanup of HLIF_MOON in regards to the number of hits and damage equation.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7900 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 tahun lalu
induk
melakukan
9d056a75f1
3 mengubah file dengan 3 tambahan dan 4 penghapusan
  1. 1 1
      db/skill_db.txt
  2. 1 2
      src/map/battle.c
  3. 1 1
      src/map/script.c

+ 1 - 1
db/skill_db.txt

@@ -596,7 +596,7 @@
 8006,0,6,4,0,1,0,5,0,no,0,0,0,none,0	//HAMI_DEFENCE
 8007,0,0,0,0,1,0,5,0,no,0,0,0,none,0	//HAMI_SKIN
 8008,0,6,4,0,1,0,3,0,no,0,0,0,none,0	//HAMI_BLOODLUST
-8009,1,8,1,0,0,0,5,1:2:2:2:3,no,0,0,0,weapon,0	//HFLI_MOON
+8009,1,8,1,0,0,0,5,-1:-2:-2:-2:-3,no,0,0,0,weapon,0	//HFLI_MOON
 8010,0,6,4,0,1,0,5,0,no,0,0,0,none,0	//HFLI_FLEET
 8011,0,6,4,0,1,0,5,0,yes,0,0,0,misc,0	//HFLI_SPEED
 8012,1,6,1,0,0,0,3,0,no,0,0,0,none,0	//HFLI_SBR44

+ 1 - 2
src/map/battle.c

@@ -1505,8 +1505,7 @@ static struct Damage battle_calc_weapon_attack(
 					skillratio += 200;
 					break;
 				case HFLI_MOON:	//[orn]
-					skillratio += ( 110 * (skill_lv + 1) ) - 100 ;
-					skillratio /= wd.div_ ;
+					skillratio += 10+110*skill_lv;
 					break;
 				case HFLI_SBR44:	//[orn]
 					skillratio += 100 * skill_lv ;

+ 1 - 1
src/map/script.c

@@ -11323,7 +11323,7 @@ void op_2(struct script_state *st,int op)
 		op_2num(st,op,i1,i2);
 	}else{
 		// si,is => error
-		ShowWarning("script: op_2: int&str, str&int not allow.");
+		ShowWarning("script: op_2: int&str, str&int not allow.\n");
 		report_src(st);
 		push_val(st->stack,C_INT,0);
 	}