zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-12 07:24:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Renamed some funcs, and fleshed out a ton on man0l1. Various related things were also added.

Browse source
This commit is contained in:
Filip Maj 2022-02-07 05:13:34 -05:00
parent 0ac53e23ad
commit 9f077190a3
20 changed files with 225 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Map Server/Actors/Chara/Player/Player.cs
View file

@ -582,7 +582,7 @@ namespace Meteor.Map.Actors
QueuePacket(SetWeatherPacket.BuildPacket(Id, SetWeatherPacket.WEATHER_CLEAR, 1));
}
public void SendZoneInPackets(WorldManager world, ushort spawnType)
public void SendZoneInPackets(WorldManager world, ushort spawnType, bool changeMap)
{
QueuePacket(SetActorIsZoningPacket.BuildPacket(Id, false));
QueuePacket(SetDalamudPacket.BuildPacket(Id, 0));
@ -957,7 +957,7 @@ namespace Meteor.Map.Actors
QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().Id, textIdOwner.Id, textId, log, LuaUtils.CreateLuaParamList(msgParams)));
}
public void SendGameMessageCustomSender(Actor textIdOwner, ushort textId, byte log, string customSender, params object[] msgParams)
public void SendGameMessageDisplayName(Actor textIdOwner, ushort textId, byte log, string customSender, params object[] msgParams)
{
if (msgParams == null || msgParams.Length == 0)
QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().Id, textIdOwner.Id, textId, customSender, log));
@ -965,7 +965,7 @@ namespace Meteor.Map.Actors
QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().Id, textIdOwner.Id, textId, customSender, log, LuaUtils.CreateLuaParamList(msgParams)));
}
public void SendGameMessageDisplayIDSender(Actor textIdOwner, ushort textId, byte log, uint displayId, params object[] msgParams)
public void SendGameMessageLocalizedDisplayName(Actor textIdOwner, ushort textId, byte log, uint displayId, params object[] msgParams)
{
if (msgParams == null || msgParams.Length == 0)
QueuePacket(GameMessagePacket.BuildPacket(Server.GetWorldManager().GetActor().Id, textIdOwner.Id, textId, displayId, log));
@ -1690,11 +1690,15 @@ namespace Meteor.Map.Actors
if (defaultTalk != null && defaultTalk.IsQuestENPC(this, npc))
return defaultTalk;
return null;
}
public Quest GetTutorialQuest(Npc npc)
{
if (npc.CurrentArea.RegionId != 101 || npc.CurrentArea.RegionId != 103 || npc.CurrentArea.RegionId != 104)
return null;
switch (npc.GetActorClassId())
{
case 1000137:
@ -1726,6 +1730,11 @@ namespace Meteor.Map.Actors
bool isCalling, isExtra;
isCalling = isExtra = false;
if (npcLSId < 1 || npcLSId > 40)
return;
npcLSId--;
switch (state)
{
case NPCLS_INACTIVE: