cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactored some actor field names

Browse Source
This commit is contained in:
Filip Maj
2022-02-05 17:48:49 -05:00
parent 563118372a
commit 4e0cf36552
42 changed files with 462 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Map Server/Actors/Area/Area.cs
View File

@@ -77,9 +77,9 @@ namespace Meteor.Map.Actors
this.bgmNight = bgmNight;
this.bgmBattle = bgmBattle;
this.displayNameId = 0;
this.customDisplayName = "_areaMaster";
this.actorName = String.Format("_areaMaster@{0:X5}", zoneId << 8);
this.LocalizedDisplayName = 0;
this.DisplayName = "_areaMaster";
this.Name = String.Format("_areaMaster@{0:X5}", zoneId << 8);
this.classPath = classPath;
this.className = classPath.Substring(classPath.LastIndexOf("/") + 1);
@@ -113,7 +113,7 @@ namespace Meteor.Map.Actors
{
List<LuaParam> lParams;
lParams = LuaUtils.CreateLuaParamList(classPath, false, true, ZoneName, "/Area/Zone/ZoneDefault", -1, (byte)1, true, false, false, false, false, false, false, false);
return ActorInstantiatePacket.BuildPacket(actorId, actorName, "ZoneDefault", lParams);
return ActorInstantiatePacket.BuildPacket(Id, Name, "ZoneDefault", lParams);
}
public override List<SubPacket> GetSpawnPackets()
@@ -139,8 +139,8 @@ namespace Meteor.Map.Actors
if (actor is Character)
((Character)actor).ResetTempVars();
if (!mActorList.ContainsKey(actor.actorId))
mActorList.Add(actor.actorId, actor);
if (!mActorList.ContainsKey(actor.Id))
mActorList.Add(actor.Id, actor);
int gridX = (int)actor.positionX / boundingGridSize;
@@ -169,7 +169,7 @@ namespace Meteor.Map.Actors
if (actor != null)
lock (mActorList)
{
mActorList.Remove(actor.actorId);
mActorList.Remove(actor.Id);
int gridX = (int)actor.positionX / boundingGridSize;
int gridY = (int)actor.positionZ / boundingGridSize;
@@ -377,7 +377,7 @@ namespace Meteor.Map.Actors
{
foreach (Player player in mActorList.Values.OfType<Player>())
{
if (player.customDisplayName.ToLower().Equals(name.ToLower()))
if (player.DisplayName.ToLower().Equals(name.ToLower()))
return player;
}
return null;
@@ -471,7 +471,7 @@ namespace Meteor.Map.Actors
if (isIsolated)
continue;
SubPacket clonedPacket = new SubPacket(packet, a.actorId);
SubPacket clonedPacket = new SubPacket(packet, a.Id);
Player p = (Player)a;
p.QueuePacket(clonedPacket);
}
@@ -490,9 +490,9 @@ namespace Meteor.Map.Actors
uint zoneId;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
zoneId = ((PrivateArea)this).GetParentZone().Id;
else
zoneId = actorId;
zoneId = Id;
Npc npc = new Npc(mActorList.Count + 1, actorClass, location.uniqueId, this, location.x, location.y, location.z, location.rot, location.state, location.animId, null);
@@ -514,9 +514,9 @@ namespace Meteor.Map.Actors
uint zoneId;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
zoneId = ((PrivateArea)this).GetParentZone().Id;
else
zoneId = actorId;
zoneId = Id;
Npc npc;
if (isMob)
@@ -547,9 +547,9 @@ namespace Meteor.Map.Actors
uint zoneId;
if (this is PrivateArea)
zoneId = ((PrivateArea)this).GetParentZone().actorId;
zoneId = ((PrivateArea)this).GetParentZone().Id;
else
zoneId = actorId;
zoneId = Id;
Npc npc = new Npc(mActorList.Count + 1, actorClass, uniqueId, this, x, y, z, 0, regionId, layoutId);
@@ -592,7 +592,7 @@ namespace Meteor.Map.Actors
if (player != null && !zoneWide)
{
player.QueuePacket(SetWeatherPacket.BuildPacket(player.actorId, weather, transitionTime));
player.QueuePacket(SetWeatherPacket.BuildPacket(player.Id, weather, transitionTime));
}
if (zoneWide)
{
@@ -603,7 +603,7 @@ namespace Meteor.Map.Actors
if (actor.Value is Player)
{
player = ((Player)actor.Value);
player.QueuePacket(SetWeatherPacket.BuildPacket(player.actorId, weather, transitionTime));
player.QueuePacket(SetWeatherPacket.BuildPacket(player.Id, weather, transitionTime));
}
}
}
@@ -615,7 +615,7 @@ namespace Meteor.Map.Actors
lock (directorLock)
{
Director director = new Director(directorIdCount, this, path, hasContentGroup, args);
currentDirectors.Add(director.actorId, director);
currentDirectors.Add(director.Id, director);
directorIdCount++;
return director;
}
@@ -663,7 +663,7 @@ namespace Meteor.Map.Actors
lock (directorLock)
{
GuildleveDirector director = new GuildleveDirector(directorIdCount, this, directorScriptPath, glid, difficulty, owner, args);
currentDirectors.Add(director.actorId, director);
currentDirectors.Add(director.Id, director);
directorIdCount++;
return director;
}

4
Map Server/Actors/Area/PrivateArea.cs
View File

@@ -66,8 +66,8 @@ namespace Meteor.Map.actors.area
string realClassName = className.Substring(className.LastIndexOf("/") + 1);
lParams = LuaUtils.CreateLuaParamList(classPath, false, true, ZoneName, PrivateAreaName, PrivateAreaType, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, false, false, false);
ActorInstantiatePacket.BuildPacket(actorId, actorName, realClassName, lParams).DebugPrintSubPacket();
return ActorInstantiatePacket.BuildPacket(actorId, actorName, realClassName, lParams);
ActorInstantiatePacket.BuildPacket(Id, Name, realClassName, lParams).DebugPrintSubPacket();
return ActorInstantiatePacket.BuildPacket(Id, Name, realClassName, lParams);
}

2
Map Server/Actors/Area/Zone.cs
View File

@@ -95,7 +95,7 @@ namespace Meteor.Map.actors.area
List<LuaParam> lParams;
lParams = LuaUtils.CreateLuaParamList(classPath, false, true, ZoneName, "", -1, canRideChocobo ? (byte)1 : (byte)0, canStealth, isInn, false, false, false, true, isInstanceRaid, isEntranceDesion);
return ActorInstantiatePacket.BuildPacket(actorId, actorName, className, lParams);
return ActorInstantiatePacket.BuildPacket(Id, Name, className, lParams);
}
public void AddSpawnLocation(SpawnLocation spawn)