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

Finished the crafting start window system. Added PassiveGuildleveQuests and refactors the Quest object. Cleaned up how zone music is handled.

Browse Source
This commit is contained in:
Filip Maj
2021-02-26 20:53:42 -05:00
parent f4e2280de8
commit 605b4918e2
34 changed files with 7121 additions and 4533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ namespace Meteor.Map.Actors
protected int halfWidth, halfHeight;
private Dictionary<uint, Director> currentDirectors = new Dictionary<uint, Director>();
private Object directorLock = new Object();
private object directorLock = new object();
private uint directorIdCount = 0;
protected Director mWeatherDirector;
@@ -77,7 +77,7 @@ namespace Meteor.Map.Actors
this.displayNameId = 0;
this.customDisplayName = "_areaMaster";
this.actorName = String.Format("_areaMaster@{0:X5}", id << 8);
this.actorName = string.Format("_areaMaster@{0:X5}", id << 8);
this.classPath = classPath;
this.className = classPath.Substring(classPath.LastIndexOf("/") + 1);
@@ -611,7 +611,7 @@ namespace Meteor.Map.Actors
public Director CreateGuildleveDirector(uint glid, byte difficulty, Player owner, params object[] args)
{
String directorScriptPath = "";
string directorScriptPath = "";
uint type = Server.GetGuildleveGamedata(glid).plateId;
@@ -677,6 +677,11 @@ namespace Meteor.Map.Actors
return null;
}
public ushort GetCurrentMusic()
{
return bgmDay;
}
public override void Update(DateTime tick)
{
lock (mActorList)
@@ -691,6 +696,5 @@ namespace Meteor.Map.Actors
}
}
}
}
}

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

@@ -32,7 +32,7 @@ namespace Meteor.Map.actors.area
private Director currentDirector;
private bool isContentFinished = false;
public static PrivateAreaContent CreateContentArea(String scriptPath)
public static PrivateAreaContent CreateContentArea(string scriptPath)
{
return null;
}

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

@@ -33,14 +33,14 @@ namespace Meteor.Map.actors.area
{
Dictionary<string, Dictionary<uint, PrivateArea>> privateAreas = new Dictionary<string, Dictionary<uint, PrivateArea>>();
Dictionary<string, List<PrivateAreaContent>> contentAreas = new Dictionary<string, List<PrivateAreaContent>>();
Object contentAreasLock = new Object();
object contentAreasLock = new object();
public SharpNav.TiledNavMesh tiledNavMesh;
public SharpNav.NavMeshQuery navMeshQuery;
public Int64 pathCalls;
public Int64 prevPathCalls = 0;
public Int64 pathCallTime;
public long pathCalls;
public long prevPathCalls = 0;
public long pathCallTime;
public Zone(uint id, string zoneName, ushort regionId, string classPath, ushort bgmDay, ushort bgmNight, ushort bgmBattle, bool isIsolated, bool isInn, bool canRideChocobo, bool canStealth, bool isInstanceRaid, bool loadNavMesh = false)
: base(id, zoneName, regionId, classPath, bgmDay, bgmNight, bgmBattle, isIsolated, isInn, canRideChocobo, canStealth, isInstanceRaid)