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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6771 54d463be-8e91-2dee-dedb-b68131a5f0ec

Browse Source
This commit is contained in:
Lance 2006-05-26 09:57:26 +00:00
parent 8320520472
commit b2b5a789a3
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
npc/sample/monster_controller.cpp
View File

@ -53,15 +53,15 @@ prontera.gat,180,200,4 script Monster Controller 123,{
break; break;
case AI_ACTION_TAR_TYPE_MOB: case AI_ACTION_TAR_TYPE_MOB:
set .@action_from$, "Monster"; set .@action_from$, "Monster";
set .@action_name$, ""+.ai_action[AI_ACTION_TAR]; set .@action_name$, rid2name(.ai_action[AI_ACTION_TAR]);
break; break;
case AI_ACTION_TAR_TYPE_PET: case AI_ACTION_TAR_TYPE_PET:
set .@action_from$, "Pet"; set .@action_from$, "Pet";
set .@action_name$, ""+.ai_action[AI_ACTION_TAR]; set .@action_name$, rid2name(.ai_action[AI_ACTION_TAR]);
break; break;
case AI_ACTION_TAR_TYPE_HOMUN: case AI_ACTION_TAR_TYPE_HOMUN:
set .@action_from$, "Homunculus"; set .@action_from$, "Homunculus";
set .@action_name$, ""+.ai_action[AI_ACTION_TAR]; set .@action_name$, rid2name(.ai_action[AI_ACTION_TAR]);
break; break;
default: default:
set .@action_from$, "Unknown"; set .@action_from$, "Unknown";

4
src/map/battle.c
View File

@ -3440,6 +3440,10 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
if(((TBL_PET *)t_bl)->msd->bl.id == md->master_id) if(((TBL_PET *)t_bl)->msd->bl.id == md->master_id)
state |= BCT_PARTY; state |= BCT_PARTY;
break; break;
case BL_HOMUNCULUS:
if(((struct homun_data *)t_bl)->master->bl.id == md->master_id)
state |= BCT_PARTY;
break;
} }
state |= BCT_ENEMY; state |= BCT_ENEMY;
break; break;

7
src/map/script.c
View File

@ -10306,8 +10306,15 @@ int buildin_rid2name(struct script_state *st){
case BL_NPC: case BL_NPC:
push_str(st->stack,C_CONSTSTR,((struct npc_data *)bl)->exname); push_str(st->stack,C_CONSTSTR,((struct npc_data *)bl)->exname);
break; break;
case BL_PET:
push_str(st->stack,C_CONSTSTR,((struct pet_data *)bl)->name);
break;
case BL_HOMUNCULUS:
push_str(st->stack,C_CONSTSTR,((struct homun_data *)bl)->name);
break;
default: default:
ShowError("buildin_rid2name: BL type unknown.\n"); ShowError("buildin_rid2name: BL type unknown.\n");
push_str(st->stack,C_CONSTSTR,"");
break; break;
} }
} }