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

- Fixed the reported map when there is an error in report_src (script.c)

Browse Source 
- Earth attacks now work on hidden enemies.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5175 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-02-03 18:53:26 +00:00
parent a4c0233fb7
commit 36ff68ba2f
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -5,6 +5,10 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/03
* Fixed the debug script messages specifying the wrong mapname for NPCs.
[Skotlex]
* Now you can't hide from earth elemental attacks (status_check_skilluse).
[Skotlex]
* Grand Cross/Grand Darkness can no longer get the ignore defense -armor
piercing bonuses from cards. [Skotlex]
* Loki's weil is now ignored by bosses. [Skotlex]

11
src/map/script.c
View File

@ -723,10 +723,17 @@ static void report_src(struct script_state *st) {
if (!bl) return;
switch (bl->type) {
case BL_NPC:
ShowDebug("Source (NPC): %s at %s (%d,%d)\n", ((struct npc_data *)bl)->name, mapindex_id2name(bl->m), bl->x, bl->y);
if (bl->m >=0)
ShowDebug("Source (NPC): %s at %s (%d,%d)\n", ((struct npc_data *)bl)->name, map[bl->m].name, bl->x, bl->y);
else
ShowDebug("Source (NPC): %s (invisible/not on a map)\n", ((struct npc_data *)bl)->name);
break;
default:
ShowDebug("Source (Non-NPC): %s (%d,%d)\n", mapindex_id2name(bl->m), bl->x, bl->y);
if (bl->m >=0)
ShowDebug("Source (Non-NPC): type %d at %s (%d,%d)\n", bl->type, map[bl->m].name, bl->x, bl->y);
else
ShowDebug("Source (Non-NPC): type %d (invisible/not on a map)\n", bl->type);
break;
}
}

15
src/map/status.c
View File

@ -726,15 +726,14 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
return 0;
}
if (src) {
race = status_get_race(src);
} else { //Ground skill, only earth-elemental skills have detecting-hitting capabilities.
race = 0;
if(skill_get_pl(skill_num) == 2)
mode|= MD_DETECTOR;
}
hide_flag = flag?OPTION_HIDE:(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK); //If targetting, cloak+hide protect you, otherwise only hiding does.
race = src?status_get_race(src):0;
//If targetting, cloak+hide protect you, otherwise only hiding does.
hide_flag = flag?OPTION_HIDE:(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK);
//You cannot hide from ground skills.
if(skill_get_pl(skill_num) == 2)
hide_flag &= ~OPTION_HIDE;
switch (target->type)
{
case BL_PC: