Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Recoded NJ_BAKUENRYU to behave as I understand it best from the skill-description (since Haplo told me this skill doesn't really has video information or anything...)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7644 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-07-12 21:26:37 +00:00
parent 8cc2239aa1
commit 5f5693bfa3
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -4,6 +4,9 @@ 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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/12 2006/07/12
* Recoded NJ_BAKUENRYU to behave as I understand it best from the
skill-description (since Haplo told me this skill doesn't really has video
information or anything...) [Skotlex]
* Fixed NJ_TATAMIGAESHI to use ground-tiles rather than "for each in path" * Fixed NJ_TATAMIGAESHI to use ground-tiles rather than "for each in path"
calls. The skill should be working correctly now, except for the fact that calls. The skill should be working correctly now, except for the fact that
the correct "unit id" is missing (this is what would give the ground tile the correct "unit id" is missing (this is what would give the ground tile

1
db/skill_unit_db.txt
View File

@ -89,7 +89,6 @@
488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE 488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE
527,0xba, , -1, 0,2000,enemy, 0x000 //NJ_TATAMIGAESHI 527,0xba, , -1, 0,2000,enemy, 0x000 //NJ_TATAMIGAESHI
535,0xbd, , 2, 0,2000,enemy, 0x000 //NJ_KAENSIN 535,0xbd, , 2, 0,2000,enemy, 0x000 //NJ_KAENSIN
536,0x86, , 2, 0, 300,enemy, 0x000 //NJ_BAKUENRYU
541,0x86,,0,2:2:3:3:4,1000,enemy,0x000 //NJ_RAIGEKISAI 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 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 516,0xbc, , 0, 3, 100,enemy, 0x000 //GS_DESPERADO

2
src/map/battle.c
View File

@ -2268,7 +2268,7 @@ struct Damage battle_calc_magic_attack(
skillratio -= 10; skillratio -= 10;
break; break;
case NJ_BAKUENRYU: case NJ_BAKUENRYU:
skillratio += 50 + 150*skill_lv; skillratio += 50*(skill_lv-1);
break; break;
case NJ_HYOUSYOURAKU: case NJ_HYOUSYOURAKU:
skillratio += 50*skill_lv; skillratio += 50*skill_lv;

25
src/map/skill.c
View File

@ -2684,15 +2684,15 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,skillid == KN_CHARGEATK?1:flag); skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,skillid == KN_CHARGEATK?1:flag);
break; break;
/* 武器系範囲攻撃スキル */ //Splash attack skills.
case AS_GRIMTOOTH: /* グリムトゥース */ case AS_GRIMTOOTH:
case MC_CARTREVOLUTION: /* カートレヴォリューション */ case MC_CARTREVOLUTION:
case NPC_SPLASHATTACK: /* スプラッシュアタック */ case NPC_SPLASHATTACK:
case AC_SHOWER: //Targetted skill implementation. case AC_SHOWER: //Targetted skill implementation.
case NJ_BAKUENRYU:
if(flag&1){ if(flag&1){
/* 個別にダメージを与える */
if(bl->id!=skill_area_temp[1]){ if(bl->id!=skill_area_temp[1]){
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick, skill_attack(skill_get_type(skillid),src,src,bl,skillid,skilllv,tick,
0x0500); 0x0500);
} }
} else { } else {
@ -2702,7 +2702,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
src,skillid,skilllv,tick, flag|BCT_ENEMY|1, src,skillid,skilllv,tick, flag|BCT_ENEMY|1,
skill_castend_damage_id); skill_castend_damage_id);
//Skill-attack at the end in case it has knockback. [Skotlex] //Skill-attack at the end in case it has knockback. [Skotlex]
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,0); skill_attack(skill_get_type(skillid),src,src,bl,skillid,skilllv,tick,0);
} }
break; break;
@ -3171,11 +3171,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break; break;
case NPC_SMOKING: //Since it is a self skill, this one ends here rather than in damage_id. [Skotlex] case NPC_SMOKING: //Since it is a self skill, this one ends here rather than in damage_id. [Skotlex]
return skill_castend_damage_id (src, bl, skillid, skilllv, tick, flag); return skill_castend_damage_id (src, bl, skillid, skilllv, tick, flag);
//These are actually ground placed.
case NJ_BAKUENRYU: //Doesn't works on the default because it is enemy-targetted.
return skill_castend_pos2(src,bl->x,bl->y,skillid,skilllv,tick,0);
default: default:
if (src == bl && skill_get_unit_id(skillid,0)) //Skill is actually ground placed. //Skill is actually ground placed.
if (src == bl && skill_get_unit_id(skillid,0))
return skill_castend_pos2(src,bl->x,bl->y,skillid,skilllv,tick,0); return skill_castend_pos2(src,bl->x,bl->y,skillid,skilllv,tick,0);
} }
@ -5818,7 +5816,6 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
case DC_SERVICEFORYOU: case DC_SERVICEFORYOU:
case GS_DESPERADO: case GS_DESPERADO:
case NJ_SUITON: case NJ_SUITON:
case NJ_BAKUENRYU:
case NJ_KAENSIN: case NJ_KAENSIN:
case NJ_HYOUSYOURAKU: case NJ_HYOUSYOURAKU:
case NJ_RAIGEKISAI: case NJ_RAIGEKISAI:
@ -6415,9 +6412,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
val1 = skilllv; val1 = skilllv;
val2 = (skilllv+1)/2 + 4; val2 = (skilllv+1)/2 + 4;
break; break;
case NJ_BAKUENRYU:
val1 = 3;
break;
case GS_GROUNDDRIFT: case GS_GROUNDDRIFT:
{ //Take on the base element, not the elemental one. { //Take on the base element, not the elemental one.
struct status_data *bstatus = status_get_base_status(src); struct status_data *bstatus = status_get_base_status(src);