diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-14 08:01:43 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-14 08:01:43 +0000 |
| commit | 35542326a8f6420e1915845934ad58f1a81c2036 (patch) | |
| tree | 31d5ea357163ffcc5b2915df028daff36c164f09 | |
| parent | 86b6dd2abc6d3925bc44c57d736467f4dfddb915 (diff) | |
| download | hercules-35542326a8f6420e1915845934ad58f1a81c2036.tar.gz hercules-35542326a8f6420e1915845934ad58f1a81c2036.tar.bz2 hercules-35542326a8f6420e1915845934ad58f1a81c2036.tar.xz hercules-35542326a8f6420e1915845934ad58f1a81c2036.zip | |
* Added auto convert advanced job and baby class sprite ID's in mob_avail.txt to correct format
* Added SC_Speedup cannot be stacked with Increase Agility
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1232 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-SVN.txt | 5 | ||||
| -rw-r--r-- | src/map/mob.c | 16 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index 8b4321fda..d776eed47 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -1,5 +1,10 @@ Date Added +03/14 + * Added auto convert advanced job and baby class sprite ID's in mob_avail.txt + to correct format [celest] + * Added SC_Speedup cannot be stacked with Increase Agility [celest] + 03/13 * Added PvP/GvG check for Tiger Knuckle fist [celest] * Fixed Pressure reducing the target's SP twice, thanks to deepin [celest] diff --git a/src/map/mob.c b/src/map/mob.c index 40eb49fe6..833332b89 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -4052,21 +4052,24 @@ static int mob_readdb_mobavail(void) *np=0; p=np+1; } else - str[j]=p; - } + str[j]=p; + } if(str[0]==NULL) continue; class_=atoi(str[0]); - if(class_<=1000 || class_>MAX_MOB_DB) // 値が異常なら処理しない。 continue; + k=atoi(str[1]); - if(k >= 0) - mob_db[class_].view_class=k; + if(k < 0) + continue; + if (j > 3 && k > 23 && k < 69) + k += 3977; // advanced job/baby class + mob_db[class_].view_class=k; - if((mob_db[class_].view_class < 24) || (mob_db[class_].view_class > 4000)) { + if((k < 24) || (k > 4000)) { mob_db[class_].sex=atoi(str[2]); mob_db[class_].hair=atoi(str[3]); mob_db[class_].hair_color=atoi(str[4]); @@ -4078,7 +4081,6 @@ static int mob_readdb_mobavail(void) mob_db[class_].option=atoi(str[10])&~0x46; mob_db[class_].clothes_color=atoi(str[11]); // Monster player dye option - Valaris } - else if(atoi(str[2]) > 0) mob_db[class_].equip=atoi(str[2]); // mob equipment [Valaris] ln++; diff --git a/src/map/status.c b/src/map/status.c index 006fb44d1..16b489660 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -743,7 +743,7 @@ int status_calc_pc(struct map_session_data* sd,int first) } if(sd->sc_data[SC_SLOWDOWN].timer!=-1) sd->speed = sd->speed*150/100; - if(sd->sc_data[SC_SPEEDUP0].timer!=-1) + if(sd->sc_data[SC_SPEEDUP0].timer!=-1 && sd->sc_data[SC_INCREASEAGI].timer==-1) sd->speed -= sd->speed*25/100; if(sd->sc_data[SC_BLESSING].timer!=-1){ // ブレッシング sd->paramb[0]+= sd->sc_data[SC_BLESSING].val1; |