diff options
| author | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-26 04:54:22 +0000 |
|---|---|---|
| committer | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-26 04:54:22 +0000 |
| commit | 317ba93ee42b32c369f7aa7f669f4acb3ac72e60 (patch) | |
| tree | f032cb881d1d50ef026b155b8c9d4e47a0b7f081 /src/map/script.c | |
| parent | 3f38fcaeaf61cf293c5392a67d85cfd5465d9585 (diff) | |
| download | hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.tar.gz hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.tar.bz2 hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.tar.xz hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.zip | |
* Added status.c and status.h of jA 1091 update and moved some functions into the new source files
* Updated auto_counter_type's description in battle_athena
* Removed some unnecessary skill level checks in battle.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@996 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/map/script.c b/src/map/script.c index 083f3cfd1..0e8a054e7 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -24,6 +24,7 @@ #include "chrif.h" #include "itemdb.h" #include "pc.h" +#include "status.h" #include "script.h" #include "storage.h" #include "mob.h" @@ -3028,7 +3029,7 @@ int buildin_getequippercentrefinery(struct script_state *st) sd=script_rid2sd(st); i=pc_checkequip(sd,equip[num-1]); if(i >= 0) - push_val(st->stack,C_INT,pc_percentrefinery(sd,&sd->status.inventory[i])); + push_val(st->stack,C_INT,status_percentrefinery(sd,&sd->status.inventory[i])); else push_val(st->stack,C_INT,0); @@ -4274,7 +4275,7 @@ int buildin_sc_start(struct script_state *st) if (bl != 0) { if(bl->type == BL_PC && ((struct map_session_data *)bl)->state.potionpitcher_flag) bl = map_id2bl(((struct map_session_data *)bl)->skilltarget); - skill_status_change_start(bl,type,val1,0,0,0,tick,0); + status_change_start(bl,type,val1,0,0,0,tick,0); } return 0; } @@ -4298,7 +4299,7 @@ int buildin_sc_start2(struct script_state *st) if(bl->type == BL_PC && ((struct map_session_data *)bl)->state.potionpitcher_flag) bl = map_id2bl(((struct map_session_data *)bl)->skilltarget); if(rand()%10000 < per) - skill_status_change_start(bl,type,val1,0,0,0,tick,0); + status_change_start(bl,type,val1,0,0,0,tick,0); return 0; } @@ -4314,7 +4315,7 @@ int buildin_sc_end(struct script_state *st) bl = map_id2bl(st->rid); if(bl->type == BL_PC && ((struct map_session_data *)bl)->state.potionpitcher_flag) bl = map_id2bl(((struct map_session_data *)bl)->skilltarget); - skill_status_change_end(bl,type,-1); + status_change_end(bl,type,-1); // if(battle_config.etc_log) // printf("sc_end : %d %d\n",st->rid,type); return 0; @@ -4336,10 +4337,10 @@ int buildin_getscrate(struct script_state *st) else bl = map_id2bl(st->rid); - luk = battle_get_luk(bl); - sc_def_mdef2=100 - (3 + battle_get_mdef(bl) + luk/3); - sc_def_vit2=100 - (3 + battle_get_vit(bl) + luk/3); - sc_def_int2=100 - (3 + battle_get_int(bl) + luk/3); + luk = status_get_luk(bl); + sc_def_mdef2=100 - (3 + status_get_mdef(bl) + luk/3); + sc_def_vit2=100 - (3 + status_get_vit(bl) + luk/3); + sc_def_int2=100 - (3 + status_get_int(bl) + luk/3); sc_def_luk2=100 - (3 + luk); if(type==SC_STONE || type==SC_FREEZE) |