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

- Fixed a comparison whn doing item searches

Browse Source 
- Fixed hom_setting&0x2 conflicting with the 'view-range' limit check.
- Stone curse now uses status_percent_damage instead of a precalculated value.
- Merged the SA_MONOCELL and SA_CLASSCHANGE code. After changing class all the status changes that cannot be triggered on bosses are dispelled. 
- SA_CLASSCHANGE now uses the bloody branch list to pick a target MVP class.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12098 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2008-01-20 14:32:10 +00:00
parent cbd15650f1
commit b4a3bad556
5 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Changelog-Trunk.txt
View File

@ -3,7 +3,13 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/01/20
* Fixed item searches not working on exact "jname" matches.
* Fixed hom_setting&0x2 conflicting with the 'view-range' limit check.
* Merged the SA_MONOCELL and SA_CLASSCHANGE code. After changing class all
the status changes that cannot be triggered on bosses are dispelled.
* SA_CLASSCHANGE now uses the bloody branch list to pick a target MVP
class. [Skotlex]
2008/01/19
* Added plugin dbghelpplug to generate more extensive crash reports in windows. [FlavioJS]
- see header of src/plugins/dbghelpplug.c to know it's capabilities

5
src/map/battle.c
View File

@ -3276,9 +3276,10 @@ bool battle_check_range(struct block_list *src,struct block_list *bl,int range)
if(src->m != bl->m) // 違うマップ
return false;
if(src->type == BL_HOM && battle_config.hom_setting&0x2)
range = battle_config.area_size + 1; //WTF, way to go Aegis and your awesome bugs.
if(src->type == BL_HOM && battle_config.hom_setting&0x2)
; //WTF, way to go Aegis and your awesome bugs.
else
if (!check_distance_bl(src, bl, range))
return false;

2
src/map/itemdb.c
View File

@ -74,7 +74,7 @@ struct item_data* itemdb_searchname(const char *str)
return item;
//Second priority to Client displayed name.
if( strcasecmp(item->name,str) == 0 )
if( strcasecmp(item->jname,str) == 0 )
item2 = item;
}

21
src/map/skill.c
View File

@ -3088,20 +3088,19 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
clif_skill_nodamage(src,bl,skillid,skilllv,1);
break;
case SA_CLASSCHANGE:
{
static int changeclass[]={1038,1039,1046,1059,1086,1087,1112,1115
,1157,1159,1190,1272,1312,1373,1492};
int class_ = mob_random_class (changeclass,ARRAYLENGTH(changeclass));
clif_skill_nodamage(src,bl,skillid,skilllv,1);
if(dstmd) mob_class_change(dstmd,class_);
}
break;
case SA_MONOCELL:
if (dstmd)
{
static int poringclass[]={1002};
int class_ = mob_random_class (poringclass,ARRAYLENGTH(poringclass));
int class_ = skillid==SA_MONOCELL?1002:mob_get_random_id(2, 1, 0);
clif_skill_nodamage(src,bl,skillid,skilllv,1);
if(dstmd) mob_class_change(dstmd,class_);
mob_class_change(dstmd,class_);
if (tsc) {
const int scs[] = { SC_QUAGMIRE, SC_PROVOKE, SC_ROKISWEIL, SC_GRAVITATION, SC_SUITON, SC_STRIPWEAPON, SC_STRIPSHIELD, SC_STRIPARMOR, SC_STRIPHELM, SC_BLADESTOP };
for (i = SC_COMMON_MIN; i <= SC_COMMON_MAX; i++)
if (tsc->data[i]) status_change_end(bl, i, -1);
for (i = 0; i < ARRAYLENGTH(scs); i++)
if (tsc->data[scs[i]]) status_change_end(bl, scs[i], -1);
}
}
break;
case SA_DEATH:

11
src/map/status.c
View File

@ -5220,8 +5220,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
break;
case SC_STONE:
val2 = status->max_hp/100; //Petrified damage per second: 1%
if (!val2) val2 = 1;
val3 = tick/1000; //Petrified HP-damage iterations.
if(val3 < 1) val3 = 1;
tick = val4; //Petrifying time.
@ -6780,14 +6778,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
}
if(--(sce->val3) > 0) {
if(++(sce->val4)%5 == 0 && status->hp > status->max_hp/4)
{
bool flag;
map_freeblock_lock();
status_zap(bl, sce->val2, 0);
flag = !sc->data[type];
map_freeblock_unlock();
if (flag) return 0; //target died, SC cancelled already.
}
status_percent_damage(NULL, bl, 1, 0, false);
sc_timer_next(1000+tick,status_change_timer, bl->id, data );
return 0;
}