Skip to content

Commit

Permalink
Follow up a63604d
Browse files Browse the repository at this point in the history
The display name of the NPC won't get appended in front of the message for globalmes script command.

Corrected area monsters spawn in Nydhoggr's Nest Instance
  • Loading branch information
Atemo committed Jan 22, 2017
1 parent 7543f1c commit 09cbf2d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions doc/script_commands.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6968,6 +6968,7 @@ characters.

If NPC name is specified, the message will be sent as if the sender would be
the NPC with the said name.
The display name of the NPC won't get appended in front of the message.

---------------------------------------

Expand Down
16 changes: 8 additions & 8 deletions npc/instances/NydhoggsNest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2153,26 +2153,26 @@ OnTouch:
2@nyd,1,1,0 script ins_nyd2_spawn_mobs -1,{
OnInstanceInit:
set .@map$, instance_mapname("2@nyd");
areamonster .@map$,200,92,180,80,"Rhyncho",2020,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead";
areamonster .@map$,200,92,180,80,"Phylla",2021,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead";
areamonster .@map$,200,92,180,80,"Dark Shadow",2023,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead";
areamonster .@map$,200,92,180,80,"Dark Pinguicula",2015,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead";
areamonster .@map$,20,12,380,172,"Rhyncho",2020,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead";
areamonster .@map$,20,12,380,172,"Phylla",2021,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead";
areamonster .@map$,20,12,380,172,"Dark Shadow",2023,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead";
areamonster .@map$,20,12,380,172,"Dark Pinguicula",2015,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead";
end;

OnMyRhynDead:
areamonster instance_mapname("2@nyd"),200,92,180,80,"Rhyncho",2020,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead";
areamonster instance_mapname("2@nyd"),20,12,380,172,"Rhyncho",2020,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead";
end;

OnMyPhyDead:
areamonster instance_mapname("2@nyd"),200,92,180,80,"Phylla",2021,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead";
areamonster instance_mapname("2@nyd"),20,12,380,172,"Phylla",2021,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead";
end;

OnMyDarkshaDead:
areamonster instance_mapname("2@nyd"),200,92,180,80,"Dark Shadow",2023,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead";
areamonster instance_mapname("2@nyd"),20,12,380,172,"Dark Shadow",2023,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead";
end;

OnMyPingDead:
areamonster instance_mapname("2@nyd"),200,92,180,80,"Dark Pinguicula",2015,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead";
areamonster instance_mapname("2@nyd"),20,12,380,172,"Dark Pinguicula",2015,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead";
end;
}

Expand Down
2 changes: 1 addition & 1 deletion src/map/npc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ int npc_globalmessage(const char* name, const char* mes)
if (!nd)
return 0;

snprintf(temp, sizeof(temp), "%s : %s", name, mes);
snprintf(temp, sizeof(temp), "%s", mes);
clif_GlobalMessage(&nd->bl,temp,ALL_CLIENT);

return 0;
Expand Down

0 comments on commit 09cbf2d

Please sign in to comment.