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

Checks and fixes for lua.

Browse Source
This commit is contained in:
Filip Maj 2017-03-20 21:51:43 -04:00
parent 7c25b14640
commit 0a94840419
5 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FFXIVClassic Map Server/actors/Actor.cs
View File

@ -60,6 +60,18 @@ namespace FFXIVClassic_Map_Server.Actors
this.moveSpeeds[3] = SetActorSpeedPacket.DEFAULT_ACTIVE; this.moveSpeeds[3] = SetActorSpeedPacket.DEFAULT_ACTIVE;
} }
public void SetPushCircleRange(string triggerName, float size)
{
if (eventConditions == null || eventConditions.pushWithCircleEventConditions == null)
return;
foreach (EventList.PushCircleEventCondition condition in eventConditions.pushWithCircleEventConditions)
{
if (condition.conditionName.Equals(triggerName))
condition.radius = size;
}
}
public SubPacket CreateAddActorPacket(uint playerActorId, byte val) public SubPacket CreateAddActorPacket(uint playerActorId, byte val)
{ {
return AddActorPacket.BuildPacket(actorId, playerActorId, val); return AddActorPacket.BuildPacket(actorId, playerActorId, val);

15
FFXIVClassic Map Server/actors/chara/npc/Npc.cs
View File

@ -63,12 +63,6 @@ namespace FFXIVClassic_Map_Server.Actors
for (int i = 0; i < 32; i++ ) for (int i = 0; i < 32; i++ )
charaWork.property[i] = (byte)(((int)actorClass.propertyFlags >> i) & 1); charaWork.property[i] = (byte)(((int)actorClass.propertyFlags >> i) & 1);
if (className.Equals("JellyfishScenarioLimsaLv00"))
{
charaWork.property[2] = 1;
npcWork.hateType = 1;
}
npcWork.pushCommand = actorClass.pushCommand; npcWork.pushCommand = actorClass.pushCommand;
npcWork.pushCommandSub = actorClass.pushCommandSub; npcWork.pushCommandSub = actorClass.pushCommandSub;
npcWork.pushCommandPriority = actorClass.pushCommandPriority; npcWork.pushCommandPriority = actorClass.pushCommandPriority;
@ -99,6 +93,11 @@ namespace FFXIVClassic_Map_Server.Actors
if (lParams != null && lParams.Count >= 3 && lParams[2].typeID == 0 && (int)lParams[2].value == 0) if (lParams != null && lParams.Count >= 3 && lParams[2].typeID == 0 && (int)lParams[2].value == 0)
isStatic = true; isStatic = true;
else
{
charaWork.property[2] = 1;
npcWork.hateType = 1;
}
if (lParams == null) if (lParams == null)
{ {
@ -140,6 +139,10 @@ namespace FFXIVClassic_Map_Server.Actors
{ {
subpackets.Add(_0xD8Packet.BuildPacket(actorId, playerActorId, 0xB09, 0x1af)); subpackets.Add(_0xD8Packet.BuildPacket(actorId, playerActorId, 0xB09, 0x1af));
} }
else if (uniqueIdentifier.Equals("closed_gridania_gate"))
{
subpackets.Add(_0xD8Packet.BuildPacket(actorId, playerActorId, 0xB79, 0x141));
}
else if (uniqueIdentifier.Equals("uldah_mapshipport_1")) else if (uniqueIdentifier.Equals("uldah_mapshipport_1"))
{ {
subpackets.Add(_0xD8Packet.BuildPacket(actorId, playerActorId, 0xdc5, 0x1af)); subpackets.Add(_0xD8Packet.BuildPacket(actorId, playerActorId, 0xdc5, 0x1af));

2
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@ -1271,7 +1271,7 @@ namespace FFXIVClassic_Map_Server.Actors
public void SendInstanceUpdate() public void SendInstanceUpdate()
{ {
Server.GetWorldManager().SeamlessCheck(this); //Server.GetWorldManager().SeamlessCheck(this);
//Update Instance //Update Instance
List<Actor> aroundMe = new List<Actor>(); List<Actor> aroundMe = new List<Actor>();

11
FFXIVClassic Map Server/lua/LuaEngine.cs
View File

@ -147,6 +147,11 @@ namespace FFXIVClassic_Map_Server.lua
private List<LuaParam> CallLuaFunctionNpcForReturn(Player player, Npc target, string funcName, params object[] args) private List<LuaParam> CallLuaFunctionNpcForReturn(Player player, Npc target, string funcName, params object[] args)
{ {
object[] args2 = new object[args.Length + 2];
Array.Copy(args, 0, args2, 2, args.Length);
args2[0] = player;
args2[1] = target;
LuaScript parent = null, child = null; LuaScript parent = null, child = null;
if (File.Exists("./scripts/base/" + target.classPath + ".lua")) if (File.Exists("./scripts/base/" + target.classPath + ".lua"))
@ -173,9 +178,9 @@ namespace FFXIVClassic_Map_Server.lua
DynValue result; DynValue result;
if (child != null && child.Globals[funcName] != null) if (child != null && child.Globals[funcName] != null)
result = child.Call(child.Globals[funcName], this); result = child.Call(child.Globals[funcName], args2);
else if (parent != null && parent.Globals[funcName] != null) else if (parent != null && parent.Globals[funcName] != null)
result = parent.Call(parent.Globals[funcName], this); result = parent.Call(parent.Globals[funcName], args2);
else else
return null; return null;
@ -218,7 +223,7 @@ namespace FFXIVClassic_Map_Server.lua
if (child != null && !child.Globals.Get(funcName).IsNil()) if (child != null && !child.Globals.Get(funcName).IsNil())
coroutine = child.CreateCoroutine(child.Globals[funcName]).Coroutine; coroutine = child.CreateCoroutine(child.Globals[funcName]).Coroutine;
else if (parent.Globals.Get(funcName) != null && !parent.Globals.Get(funcName).IsNil()) else if (parent != null && parent.Globals.Get(funcName) != null && !parent.Globals.Get(funcName).IsNil())
coroutine = parent.CreateCoroutine(parent.Globals[funcName]).Coroutine; coroutine = parent.CreateCoroutine(parent.Globals[funcName]).Coroutine;
if (coroutine != null) if (coroutine != null)

3
FFXIVClassic Map Server/lua/LuaUtils.cs
View File

@ -253,6 +253,9 @@ namespace FFXIVClassic_Map_Server
{ {
List<LuaParam> luaParams = new List<LuaParam>(); List<LuaParam> luaParams = new List<LuaParam>();
if (fromScript == null)
return luaParams;
if (fromScript.Type == DataType.Tuple) if (fromScript.Type == DataType.Tuple)
{ {
foreach (DynValue d in fromScript.Tuple) foreach (DynValue d in fromScript.Tuple)