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

Added back loading defaulttalk npcs through script. Should speed up warps now! Added loading mapobj ifno through a db table, removing the need for unique scripts. Deleted ported mapobj scripts.

Browse Source
This commit is contained in:
Filip Maj
2022-03-03 19:34:33 -05:00
parent b773098abf
commit 2cb6a9f6bd
74 changed files with 49 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,7 +517,7 @@ namespace Meteor.Map.Actors
if (actorClass == null)
return;
Npc npc = new Npc(mActorList.Count + 1, actorClass, location.uniqueId, this, location.x, location.y, location.z, location.rot, 0, location.motionPack, null);
Npc npc = new Npc(mActorList.Count + 1, actorClass, location.uniqueId, this, location.x, location.y, location.z, location.rot, 0, location.motionPack, null, location.mapObjLayoutId, location.mapObjInstanceId);
npc.LoadEventConditions(actorClass.eventConditions);

9
Map Server/Actors/Area/SpawnLocation.cs
View File

@@ -34,7 +34,10 @@ namespace Meteor.Map.actors.area
public float rot;
public uint motionPack;
public SpawnLocation(uint classId, string uniqueId, uint zoneId, string privAreaName, int privAreaLevel, float x, float y, float z, float rot, uint animId)
public uint mapObjLayoutId;
public uint mapObjInstanceId;
public SpawnLocation(uint classId, string uniqueId, uint zoneId, string privAreaName, int privAreaLevel, float x, float y, float z, float rot, uint animId, uint mapObjLayoutId, uint mapObjInstanceId)
{
this.classId = classId;
this.uniqueId = uniqueId;
@@ -46,6 +49,8 @@ namespace Meteor.Map.actors.area
this.z = z;
this.rot = rot;
this.motionPack = animId;
}
this.mapObjLayoutId = mapObjLayoutId;
this.mapObjInstanceId = mapObjInstanceId;
}
}
}