diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-01 21:14:27 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-01 21:14:27 +0000 |
| commit | 2c82c85e3857f9bcf513f4771f393f5f788f7f3f (patch) | |
| tree | e29a43029cde3a36f8c43aadfb5a55195350599e /src/map/status.c | |
| parent | 81a95db7c1ad0099c5198b1d891225918253fa29 (diff) | |
| download | hercules-2c82c85e3857f9bcf513f4771f393f5f788f7f3f.tar.gz hercules-2c82c85e3857f9bcf513f4771f393f5f788f7f3f.tar.bz2 hercules-2c82c85e3857f9bcf513f4771f393f5f788f7f3f.tar.xz hercules-2c82c85e3857f9bcf513f4771f393f5f788f7f3f.zip | |
- Added -DMAPREGSQL to Makefile, commented out by default for now.
- Fixed AL_WARP displaying "Unknown Area" selections when you don't have all memo points used up.
- Fixed alive_count not being reset on skill unitsetting, which leads to some groups not being cleared once all their units expire.
- Optimized Kahii, will now only show the amount of HP healed. Moved to skill_counter additional effect so it may trigger even on miss.
- SKA no longer blocks skills.
- Modified the AM_TWILIGHT* skills to require 200 medicine bowls.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6435 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index 8ceae398c..df12ad208 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -437,8 +437,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int (sc->data[SC_MARIONETTE2].timer != -1 && skill_num == CG_MARIONETTE) ||
sc->data[SC_SILENCE].timer != -1 ||
sc->data[SC_STEELBODY].timer != -1 ||
- sc->data[SC_BERSERK].timer != -1 ||
- sc->data[SC_SKA].timer != -1
+ sc->data[SC_BERSERK].timer != -1
))
return 0;
//Skill blocking.
@@ -4430,7 +4429,10 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val val4 = gettick(); //Store time at which you started running.
calc_flag = 1;
break;
-
+ case SC_KAAHI:
+ val2 = 200*val1; //HP heal
+ val3 = 5*val1; //SP cost
+ break;
case SC_TRICKDEAD: /* 死んだふり */
{
struct view_data *vd = status_get_viewdata(bl);
@@ -4561,7 +4563,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_CLOSECONFINE:
case SC_SKILLRATE_UP:
case SC_KAIZEL:
- case SC_KAAHI:
case SC_INTRAVISION:
case SC_BASILICA:
case SC_MAXOVERTHRUST:
|