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

- Added a new column in the skill_db to specify the splash-range/area-of-effect of skills. (Work in progress)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5302 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-02-16 21:53:05 +00:00
parent 0f1ea43892
commit fbc4c4f453
5 changed files with 564 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/16
* Added a new column in the skill_db to specify the
splash-range/area-of-effect of skills. (Work in progress) [Skotlex]
* Autocasted AL_TELEPORT should now automatically pick menu entry rather
than showing the box up. [Skotlex]
* The battle config options sp_rate and hp_rate are now applied

3
db/Changelog.txt
View File

@ -29,6 +29,9 @@
=========================
20/16
* Added a new column in the skill_db to specify the
splash-range/area-of-effect of skills. [Skotlex]
02/14
* Part 1 of Gravitys "Zeny Inflation Control Update" [Poki#3]
- All potion type drops from monsters are changed with Herbs (Excluding MvP Monsters).

1087
db/skill_db.txt
View File

File diff suppressed because it is too large Load Diff

26
src/map/skill.c
View File

@ -590,6 +590,7 @@ int skill_get_pl( int id ){ skill_get (skill_db[id].pl, id, 1); }
int skill_get_nk( int id ){ skill_get (skill_db[id].nk, id, 1); }
int skill_get_max( int id ){ skill_chk (id, 1); return (id < 500 || id > 1000) ? skill_db[id].max : guild_skill_get_max(id); }
int skill_get_range( int id , int lv ){ skill_chk (id, lv); return (id < 500 || id > 1000) ? skill_db[id].range[lv-1] : 0; }
int skill_get_splash( int id , int lv ){ skill_chk (id, lv); return (id < 500 || id > 1000) ? (skill_db[id].splash[lv-1]>=0?skill_db[id].splash[lv-1]:AREA_SIZE) : 0; }
int skill_get_hp( int id ,int lv ){ skill_get (skill_db[id].hp[lv-1], id, lv); }
int skill_get_sp( int id ,int lv ){ skill_get (skill_db[id].sp[lv-1], id, lv); }
int skill_get_zeny( int id ,int lv ){ skill_get (skill_db[id].zeny[lv-1], id, lv); }
@ -11188,8 +11189,8 @@ int skill_readdb(void)
char *split[50];
if(line[0]=='/' && line[1]=='/')
continue;
j = skill_split_str(line,split,14);
if(j < 14 || split[13]==NULL)
j = skill_split_str(line,split,15);
if(j < 15 || split[14]==NULL)
continue;
i=atoi(split[0]);
@ -11203,25 +11204,26 @@ int skill_readdb(void)
skill_db[i].inf=atoi(split[3]);
skill_db[i].pl=atoi(split[4]);
skill_db[i].nk=atoi(split[5]);
skill_db[i].max=atoi(split[6]);
skill_split_atoi(split[7],skill_db[i].num);
skill_split_atoi(split[6],skill_db[i].splash);
skill_db[i].max=atoi(split[7]);
skill_split_atoi(split[8],skill_db[i].num);
if(strcmpi(split[8],"yes") == 0)
if(strcmpi(split[9],"yes") == 0)
skill_db[i].castcancel=1;
else
skill_db[i].castcancel=0;
skill_db[i].cast_def_rate=atoi(split[9]);
skill_db[i].inf2=atoi(split[10]);
skill_db[i].maxcount=atoi(split[11]);
if(strcmpi(split[12],"weapon") == 0)
skill_db[i].cast_def_rate=atoi(split[10]);
skill_db[i].inf2=atoi(split[11]);
skill_db[i].maxcount=atoi(split[12]);
if(strcmpi(split[13],"weapon") == 0)
skill_db[i].skill_type=BF_WEAPON;
else if(strcmpi(split[12],"magic") == 0)
else if(strcmpi(split[13],"magic") == 0)
skill_db[i].skill_type=BF_MAGIC;
else if(strcmpi(split[12],"misc") == 0)
else if(strcmpi(split[13],"misc") == 0)
skill_db[i].skill_type=BF_MISC;
else
skill_db[i].skill_type=0;
skill_split_atoi(split[13],skill_db[i].blewcount);
skill_split_atoi(split[14],skill_db[i].blewcount);
for (j = 0; skill_names[j].id != 0; j++)
if (skill_names[j].id == i) {

2
src/map/skill.h
View File

@ -46,7 +46,7 @@
struct skill_db {
char *name;
char *desc;
int range[MAX_SKILL_LEVEL],hit,inf,pl,nk,max;
int range[MAX_SKILL_LEVEL],hit,inf,pl,nk,splash[MAX_SKILL_LEVEL],max;
int num[MAX_SKILL_LEVEL];
int cast[MAX_SKILL_LEVEL],delay[MAX_SKILL_LEVEL];
int upkeep_time[MAX_SKILL_LEVEL],upkeep_time2[MAX_SKILL_LEVEL];