summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-26 19:12:00 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-26 19:12:00 +0000
commit91a25bb1534462030596bcd17784cd91e95cd88a (patch)
tree5da66da8f67a6a0bf5fce7f95c99e51fe900e603
parentb3c0a6ccc854c125f481b24d57b7f2747b7200ba (diff)
downloadhercules-91a25bb1534462030596bcd17784cd91e95cd88a.tar.gz
hercules-91a25bb1534462030596bcd17784cd91e95cd88a.tar.bz2
hercules-91a25bb1534462030596bcd17784cd91e95cd88a.tar.xz
hercules-91a25bb1534462030596bcd17784cd91e95cd88a.zip
- Some code cleanup of HLIF_MOON in regards to the number of hits and damage equation.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7900 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/skill_db.txt2
-rw-r--r--src/map/battle.c3
-rw-r--r--src/map/script.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 831c3a414..9504f76cb 100644
--- a/db/skill_db.txt
+++ b/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
diff --git a/src/map/battle.c b/src/map/battle.c
index f11e014fc..f8f16c2b1 100644
--- a/src/map/battle.c
+++ b/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 ;
diff --git a/src/map/script.c b/src/map/script.c
index 476e9011f..cf1ae0c17 100644
--- a/src/map/script.c
+++ b/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);
}