diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-22 16:08:24 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-22 16:08:24 +0000 |
| commit | f65bf4bd28cd9240c889bfd2a1f4650d91760a2d (patch) | |
| tree | 6730a4d5ca802cc2c4cdb128dca07f1e95cac0fb /src/map/status.c | |
| parent | 6b0b62a5b2a9d85f60afe4fe048403101bd8f39d (diff) | |
| download | hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.tar.gz hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.tar.bz2 hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.tar.xz hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.zip | |
* Corrected Spiral Pierce's hits in the skill_db
* Moved /common/*.o into a obj folder when compiling
* Updated core and map server to jA 1094~1115
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1162 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/src/map/status.c b/src/map/status.c index 0d35572d0..5275be42a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -31,14 +31,17 @@ int SkillStatusChangeTable[]={ /* status.hのenumのSC_***とあわせること */ -1, 1,-1, /* 10- */ SC_SIGHT, /* サイト */ - -1,-1,-1,-1, + -1, + SC_SAFETYWALL, /* セーフティーウォール */ + -1,-1,-1, SC_FREEZE, /* フロストダイバ? */ SC_STONE, /* スト?ンカ?ス */ -1,-1,-1, /* 20- */ -1,-1,-1,-1, SC_RUWACH, /* ルアフ */ - -1,-1,-1,-1, + SC_PNEUMA, /* ニューマ */ + -1,-1,-1, SC_INCREASEAGI, /* 速度?加 */ /* 30- */ SC_DECREASEAGI, /* 速度減少 */ @@ -3585,15 +3588,6 @@ int status_change_start(struct block_list *bl,int type,int val1,int val2,int val case SC_ANKLE: break; - /* ウォ?タ?ボ?ル */ - case SC_WATERBALL: - tick=150; - if(val1>5) //レベルが5以上の場合は25?に制限(1?目はすでに打ってるので-1) - val3=5*5-1; - else - val3= (val1|1)*(val1|1)-1; - break; - /* スキルじゃない/時間に?係しない */ case SC_RIDING: calc_flag = 1; @@ -4361,21 +4355,6 @@ int status_change_timer(int tid, unsigned int tick, int id, int data) } break; - case SC_WATERBALL: /* ウォ?タ?ボ?ル */ - { - struct block_list *target=map_id2bl(sc_data[type].val2); - if (!target || !target->prev) - break; // target has been killed in previous hits, no need to raise an alarm ^^; - // nullpo_retb(target); - // nullpo_retb(target->prev); - skill_attack(BF_MAGIC,bl,bl,target,WZ_WATERBALL,sc_data[type].val1,tick,0); - if((--sc_data[type].val3)>0) { - sc_data[type].timer=add_timer( 150+tick,status_change_timer, bl->id, data ); - return 0; - } - } - break; - case SC_ENDURE: /* インデュア */ case SC_AUTOBERSERK: // Celest if(sd && sd->special_state.infinite_endure) { |