diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-14 13:34:03 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-14 13:34:03 +0000 |
| commit | af5a9674dc39e941466fe92502d77f1a6861d0c0 (patch) | |
| tree | e907860561352d60e1719cc8e979a40cf584625c | |
| parent | eadb49db50f6d6c8ab7fe2724e94c28f4690a1ea (diff) | |
| download | hercules-af5a9674dc39e941466fe92502d77f1a6861d0c0.tar.gz hercules-af5a9674dc39e941466fe92502d77f1a6861d0c0.tar.bz2 hercules-af5a9674dc39e941466fe92502d77f1a6861d0c0.tar.xz hercules-af5a9674dc39e941466fe92502d77f1a6861d0c0.zip | |
- Reverted the hp conversion formula "fix" as it was correct before.
- Increased the trigger rate of Warmth skills from 500ms to 200ms.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9214 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/skill_unit_db.txt | 6 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt index 986e2e724..6af06491c 100644 --- a/db/skill_unit_db.txt +++ b/db/skill_unit_db.txt @@ -83,9 +83,9 @@ 405,0xb7, , 0, 1,1000,enemy, 0x000 //PF_SPIDERWEB
409,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLBABY
410,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLPARENT
-428,0x86, , 0, 1, 500,enemy, 0x000 //SG_SUN_WARM
-429,0x86, , 0, 1, 500,enemy, 0x000 //SG_MOON_WARM
-430,0x86, , 0, 1, 500,enemy, 0x000 //SG_STAR_WARM
+428,0x86, , 0, 1, 200,enemy, 0x000 //SG_SUN_WARM
+429,0x86, , 0, 1, 200,enemy, 0x000 //SG_MOON_WARM
+430,0x86, , 0, 1, 200,enemy, 0x000 //SG_STAR_WARM
484,0xb8, , 2, 0,1000,enemy, 0x808 //HW_GRAVITATION
488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE
516,0xba, , 3, 0, 100,enemy, 0x000 //GS_DESPERADO
diff --git a/src/map/skill.c b/src/map/skill.c index 65b47863b..60d992671 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4995,7 +4995,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in { int hp, sp; hp = sstatus->max_hp/10; - sp = hp + (hp * 10 * skilllv) / 100; + sp = hp * 10 * skilllv / 100; if (!status_charge(src,hp,0)) { if (sd) clif_skill_fail(sd,skillid,0,0); break; @@ -5004,6 +5004,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in status_heal(bl,0,sp,2); } break; + case HT_REMOVETRAP: clif_skill_nodamage(src,bl,skillid,skilllv,1); { |