summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-13 20:25:13 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-13 20:25:13 +0000
commit692914bd8b2ec74f185eac77be3479d5a5235cb4 (patch)
tree750a6a469d8c780e6b4765918c019072b528f4b2
parent6301743e9002b391f83dca77a8e03fcbcd5f6d33 (diff)
downloadhercules-692914bd8b2ec74f185eac77be3479d5a5235cb4.tar.gz
hercules-692914bd8b2ec74f185eac77be3479d5a5235cb4.tar.bz2
hercules-692914bd8b2ec74f185eac77be3479d5a5235cb4.tar.xz
hercules-692914bd8b2ec74f185eac77be3479d5a5235cb4.zip
- Corrected NJ_KAENSIN as per description.
- Fixed a leaking map_freeblocklock on skill_del_unitgroup. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7659 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--db/Changelog.txt3
-rw-r--r--db/skill_db.txt2
-rw-r--r--db/skill_unit_db.txt2
-rw-r--r--src/map/skill.c12
5 files changed, 12 insertions, 9 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5f5f7355f..2199543d7 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/13
+ * Corrected NJ_KAENSIN as per description. [Skotlex]
+ * Fixed a leaking map_freeblocklock on skill_del_unitgroup. [Skotlex]
* Changed the default save interval to 5 minutes. Added support for
specifying fixed save-intervals by using negative values. [Skotlex] EG:
- Save interval set to 300 (5 minutes): all characters will be saved in
diff --git a/db/Changelog.txt b/db/Changelog.txt
index a776c3f14..494864ec1 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -24,6 +24,9 @@
-----
=========================
+07/13
+ * Fixed the Kaensin info in skill_db/skill_unit_db... before the skill was
+ overpowered. Now... I think it's underpowered :D [Skotlex]
07/12
* Tao Gunga will now summon G_Megalith's. [Poki#3]
* Updated the new Rachel mob names and the new G_ mobs stats & skills. Also removed there poring drops. [Poki#3]
diff --git a/db/skill_db.txt b/db/skill_db.txt
index b79a9f4a2..f7acb1481 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -556,7 +556,7 @@
532,0,6,4,0,1,0,10,1,no,0,0,0,none,0 //NJ_BUNSINJYUTSU#NJ_BUNSINJYUTSU#
533,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //NJ_NINPOU#NJ_NINPOU#
534,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,no,0,0,0,magic,0 //NJ_KOUENKA#NJ_KOUENKA#
-535,0,8,4,3,0,2,10,5:5:6:6:7:7:8:8:9:9,no,0,0,0,magic,0 //NJ_KAENSIN#NJ_KAENSIN#
+535,0,8,4,3,0,0,10,1,no,0,0,0,magic,0 //NJ_KAENSIN#NJ_KAENSIN#
536,9,8,1,3,2,2,5,3,no,0,0,0,magic,0 //NJ_BAKUENRYU#NJ_BAKUENRYU#
537,9,8,1,1,0,0,10,1:2:3:4:5:6:7:7:7:7,no,0,0,0,magic,0 //NJ_HYOUSENSOU#NJ_HYOUSENSOU#
538,9,6,2,0,1,0,10,1,no,0,0,0,magic,0 //NJ_SUITON#NJ_SUITON#
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 444090d57..8994d42d6 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -88,7 +88,7 @@
484,0xb8, , 2, 0,1000,enemy, 0x808 //HW_GRAVITATION
488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE
527,0xba, , -1, 0,2000,enemy, 0x000 //NJ_TATAMIGAESHI
-535,0xbd, , 2, 0,2000,enemy, 0x000 //NJ_KAENSIN
+535,0xbd, , 2, 0,2000,enemy, 0x008 //NJ_KAENSIN
541,0x86,,0,2:2:3:3:4,1000,enemy,0x000 //NJ_RAIGEKISAI
538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010 //NJ_SUITON
516,0xbc, , 0, 3, 100,enemy, 0x000 //GS_DESPERADO
diff --git a/src/map/skill.c b/src/map/skill.c
index dc6194691..b55c6bea8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3069,7 +3069,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
//case NJ_KASUMIKIRI:
//case NJ_KIRIKAGE:
//case NJ_KOUENKA:
- case NJ_KAENSIN:
//case NJ_HYOUSENSOU:
//case NJ_HYOUSYOURAKU:
//case NJ_HUUJIN:
@@ -6409,8 +6408,8 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
if (sd) val1 = sd->status.child;
break;
case NJ_KAENSIN:
- val1 = skilllv;
- val2 = (skilllv+1)/2 + 4;
+ val1 = (skilllv+1)/2 + 4;
+ skill_clear_group(src,1);
break;
case GS_GROUNDDRIFT:
@@ -7032,9 +7031,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
case UNT_KAENSIN:
skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
- src->val2--;
- if (--src->val2<=0)
- skill_delunit(src);
+ if (--sg->val1 <= 0)
+ skill_delunitgroup(NULL,sg);
break;
}
@@ -8895,6 +8893,7 @@ int skill_clear_group (struct block_list *bl, int flag)
case SA_VIOLENTGALE:
case SA_LANDPROTECTOR:
case NJ_SUITON:
+ case NJ_KAENSIN:
if (flag&1)
group[count++]= ud->skillunit[i];
break;
@@ -9441,7 +9440,6 @@ int skill_delunitgroup (struct block_list *src, struct skill_unit_group *group)
group->valstr=NULL;
}
- map_freeblock((struct block_list*)group->unit); /* aFree()の替わり */
group->unit=NULL;
group->group_id=0;
group->unit_count=0;