zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-28 05:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into ioncannon/crafting_and_localleves

Browse source
This commit is contained in:
Filip Maj 2021-02-26 21:20:37 -05:00
commit 8a5b97f5b2
15 changed files with 160 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2732,7 +2732,7 @@ namespace Meteor.Map.Actors
private void EquipAbilitiesAtLevel(byte classId, short level, List<CommandResult> actionList = null)
{
//If there's any abilites that unlocks at this level, equip them.
List<ushort> commandIds = Server.GetWorldManager().GetBattleCommandIdByLevel(classId, GetLevel());
List<ushort> commandIds = Server.GetWorldManager().GetBattleCommandIdByLevel(classId, level);
foreach (ushort commandId in commandIds)
{
EquipAbilityInFirstOpenSlot(classId, commandId, false);

4
Map Server/Actors/EventList.cs
View file

@ -79,8 +79,10 @@ namespace Meteor.Map.actors
public class PushBoxEventCondition
{
public uint bgObj;
public uint layout;
public string conditionName = "";
public float size = 30.0f;
public string reactName = "";
public bool outwards = false;
public bool silent = true;
}

18
Map Server/Packets/Send/Actor/Events/SetPushEventConditionWithTriggerBox.cs
View file

@ -26,7 +26,7 @@ using System.Text;
using Meteor.Common;
namespace Meteor.Map.packets.send.actor.events
namespace Meteor.Map.packets.send.actor.events
{
class SetPushEventConditionWithTriggerBox
{
@ -41,18 +41,20 @@ namespace Meteor.Map.packets.send.actor.events
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((UInt32)condition.size);
binWriter.Write((UInt32)0x1A5);
binWriter.Write((UInt32)4);
binWriter.Seek(8, SeekOrigin.Current);
binWriter.Write((UInt32)condition.bgObj); // bgObj
binWriter.Write((UInt32)condition.layout); // Layout
binWriter.Write((UInt32)4); // Actor? Always 4 in 1.23
binWriter.Seek(8, SeekOrigin.Current); // Unknowns
binWriter.Write((Byte)(condition.outwards ? 0x11 : 0x0)); //If == 0x10, Inverted Bounding Box
binWriter.Write((Byte)3);
binWriter.Write((Byte)(condition.silent ? 0x1 : 0x0)); //Silent Trigger;
binWriter.Write(Encoding.ASCII.GetBytes(condition.conditionName), 0, Encoding.ASCII.GetByteCount(condition.conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(condition.conditionName));
binWriter.Write(Encoding.ASCII.GetBytes(condition.conditionName), 0, Encoding.ASCII.GetByteCount(condition.conditionName) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(condition.conditionName));
binWriter.Seek(55, SeekOrigin.Begin);
binWriter.Write((Byte)0); // Unknown
binWriter.Write(Encoding.ASCII.GetBytes(condition.reactName), 0, Encoding.ASCII.GetByteCount(condition.reactName) >= 0x04 ? 0x04 : Encoding.ASCII.GetByteCount(condition.reactName));
}
}
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}
}