zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-30 06:16:15 +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;
}