Skip to content

Commit

Permalink
Merge pull request #47 from AlbionBot/development
Browse files Browse the repository at this point in the history 
update to v1.11.362.117521
  • Loading branch information
@AlbionBot
AlbionBot authored May 20, 2018
2 parents 74fa3d1 + fae7610 commit 6505bd9
Show file tree
Hide file tree
Showing 133 changed files with 917 additions and 917 deletions.
14 changes: 7 additions & 7 deletions Albion/Albion_Direct/Direct/ActionBuildingObject.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////////
// Merlin API for Albion Online v1.11.362.117031-prod
// Merlin API for Albion Online v1.11.362.117521-prod
////////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
// <auto-generated>
Expand All @@ -21,18 +21,18 @@

namespace Albion_Direct
{
/* Internal type: a6k */
/* Internal type: a6t */
public partial class ActionBuildingObject : BuildingObject
{
private static List<MethodInfo> _methodReflectionPool = new List<MethodInfo>();
private static List<PropertyInfo> _propertyReflectionPool = new List<PropertyInfo>();
private static List<FieldInfo> _fieldReflectionPool = new List<FieldInfo>();

private a6k _internal;
private a6t _internal;

#region Properties

public a6k ActionBuildingObject_Internal => _internal;
public a6t ActionBuildingObject_Internal => _internal;

#endregion

Expand All @@ -48,7 +48,7 @@ public partial class ActionBuildingObject : BuildingObject

#region Constructor

public ActionBuildingObject(a6k instance) : base(instance)
public ActionBuildingObject(a6t instance) : base(instance)
{
_internal = instance;
}
Expand All @@ -62,12 +62,12 @@ static ActionBuildingObject()

#region Conversion

public static implicit operator a6k(ActionBuildingObject instance)
public static implicit operator a6t(ActionBuildingObject instance)
{
return instance._internal;
}

public static implicit operator ActionBuildingObject(a6k instance)
public static implicit operator ActionBuildingObject(a6t instance)
{
return new ActionBuildingObject(instance);
}
Expand Down
14 changes: 7 additions & 7 deletions Albion/Albion_Direct/Direct/ActionPoint.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////////
// Merlin API for Albion Online v1.11.362.117031-prod
// Merlin API for Albion Online v1.11.362.117521-prod
////////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
// <auto-generated>
Expand All @@ -21,18 +21,18 @@

namespace Albion_Direct
{
/* Internal type: ai6 */
/* Internal type: ajd */
public partial struct ActionPoint
{
private static List<MethodInfo> _methodReflectionPool = new List<MethodInfo>();
private static List<PropertyInfo> _propertyReflectionPool = new List<PropertyInfo>();
private static List<FieldInfo> _fieldReflectionPool = new List<FieldInfo>();

private ai6 _internal;
private ajd _internal;

#region Properties

public ai6 ActionPoint_Internal => _internal;
public ajd ActionPoint_Internal => _internal;

#endregion

Expand All @@ -48,7 +48,7 @@ public partial struct ActionPoint

#region Constructor

public ActionPoint(ai6 instance)
public ActionPoint(ajd instance)
{
_internal = instance;
}
Expand All @@ -62,12 +62,12 @@ static ActionPoint()

#region Conversion

public static implicit operator ai6(ActionPoint instance)
public static implicit operator ajd(ActionPoint instance)
{
return instance._internal;
}

public static implicit operator ActionPoint(ai6 instance)
public static implicit operator ActionPoint(ajd instance)
{
return new ActionPoint(instance);
}
Expand Down
14 changes: 7 additions & 7 deletions Albion/Albion_Direct/Direct/ActiveSpellDescriptor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////////
// Merlin API for Albion Online v1.11.362.117031-prod
// Merlin API for Albion Online v1.11.362.117521-prod
////////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
// <auto-generated>
Expand All @@ -21,18 +21,18 @@

namespace Albion_Direct
{
/* Internal type: cv */
/* Internal type: cx */
public partial class ActiveSpellDescriptor : SpellDescriptor
{
private static List<MethodInfo> _methodReflectionPool = new List<MethodInfo>();
private static List<PropertyInfo> _propertyReflectionPool = new List<PropertyInfo>();
private static List<FieldInfo> _fieldReflectionPool = new List<FieldInfo>();

private cv _internal;
private cx _internal;

#region Properties

public cv ActiveSpellDescriptor_Internal => _internal;
public cx ActiveSpellDescriptor_Internal => _internal;
public SpellAssessment Assesment => _internal.bq.ToWrapped();
public SpellCategory Category => _internal.bp.ToWrapped();
public float EnergyCost => _internal.bg;
Expand All @@ -52,7 +52,7 @@ public partial class ActiveSpellDescriptor : SpellDescriptor

#region Constructor

public ActiveSpellDescriptor(cv instance) : base(instance)
public ActiveSpellDescriptor(cx instance) : base(instance)
{
_internal = instance;
}
Expand All @@ -66,12 +66,12 @@ static ActiveSpellDescriptor()

#region Conversion

public static implicit operator cv(ActiveSpellDescriptor instance)
public static implicit operator cx(ActiveSpellDescriptor instance)
{
return instance._internal;
}

public static implicit operator ActiveSpellDescriptor(cv instance)
public static implicit operator ActiveSpellDescriptor(cx instance)
{
return new ActiveSpellDescriptor(instance);
}
Expand Down
14 changes: 7 additions & 7 deletions Albion/Albion_Direct/Direct/AgentDescriptor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////////
// Merlin API for Albion Online v1.11.362.117031-prod
// Merlin API for Albion Online v1.11.362.117521-prod
////////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
// <auto-generated>
Expand All @@ -21,18 +21,18 @@

namespace Albion_Direct
{
/* Internal type: apm */
/* Internal type: apu */
public partial class AgentDescriptor
{
private static List<MethodInfo> _methodReflectionPool = new List<MethodInfo>();
private static List<PropertyInfo> _propertyReflectionPool = new List<PropertyInfo>();
private static List<FieldInfo> _fieldReflectionPool = new List<FieldInfo>();

private apm _internal;
private apu _internal;

#region Properties

public apm AgentDescriptor_Internal => _internal;
public apu AgentDescriptor_Internal => _internal;

#endregion

Expand All @@ -48,7 +48,7 @@ public partial class AgentDescriptor

#region Constructor

public AgentDescriptor(apm instance)
public AgentDescriptor(apu instance)
{
_internal = instance;
}
Expand All @@ -62,12 +62,12 @@ static AgentDescriptor()

#region Conversion

public static implicit operator apm(AgentDescriptor instance)
public static implicit operator apu(AgentDescriptor instance)
{
return instance._internal;
}

public static implicit operator AgentDescriptor(apm instance)
public static implicit operator AgentDescriptor(apu instance)
{
return new AgentDescriptor(instance);
}
Expand Down
14 changes: 7 additions & 7 deletions Albion/Albion_Direct/Direct/AgentTypeDescriptor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////////
// Merlin API for Albion Online v1.11.362.117031-prod
// Merlin API for Albion Online v1.11.362.117521-prod
////////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
// <auto-generated>
Expand All @@ -21,18 +21,18 @@

namespace Albion_Direct
{
/* Internal type: dd */
/* Internal type: df */
public partial class AgentTypeDescriptor
{
private static List<MethodInfo> _methodReflectionPool = new List<MethodInfo>();
private static List<PropertyInfo> _propertyReflectionPool = new List<PropertyInfo>();
private static List<FieldInfo> _fieldReflectionPool = new List<FieldInfo>();

private dd _internal;
private df _internal;

#region Properties

public dd AgentTypeDescriptor_Internal => _internal;
public df AgentTypeDescriptor_Internal => _internal;

#endregion

Expand All @@ -48,7 +48,7 @@ public partial class AgentTypeDescriptor

#region Constructor

public AgentTypeDescriptor(dd instance)
public AgentTypeDescriptor(df instance)
{
_internal = instance;
}
Expand All @@ -62,12 +62,12 @@ static AgentTypeDescriptor()

#region Conversion

public static implicit operator dd(AgentTypeDescriptor instance)
public static implicit operator df(AgentTypeDescriptor instance)
{
return instance._internal;
}

public static implicit operator AgentTypeDescriptor(dd instance)
public static implicit operator AgentTypeDescriptor(df instance)
{
return new AgentTypeDescriptor(instance);
}
Expand Down
14 changes: 7 additions & 7 deletions Albion/Albion_Direct/Direct/AgentsDataFile.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////////
// Merlin API for Albion Online v1.11.362.117031-prod
// Merlin API for Albion Online v1.11.362.117521-prod
////////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
// <auto-generated>
Expand All @@ -21,18 +21,18 @@

namespace Albion_Direct
{
/* Internal type: dc */
/* Internal type: de */
public partial class AgentsDataFile : DataFile
{
private static List<MethodInfo> _methodReflectionPool = new List<MethodInfo>();
private static List<PropertyInfo> _propertyReflectionPool = new List<PropertyInfo>();
private static List<FieldInfo> _fieldReflectionPool = new List<FieldInfo>();

private dc _internal;
private de _internal;

#region Properties

public dc AgentsDataFile_Internal => _internal;
public de AgentsDataFile_Internal => _internal;

#endregion

Expand All @@ -48,7 +48,7 @@ public partial class AgentsDataFile : DataFile

#region Constructor

public AgentsDataFile(dc instance) : base(instance)
public AgentsDataFile(de instance) : base(instance)
{
_internal = instance;
}
Expand All @@ -62,12 +62,12 @@ static AgentsDataFile()

#region Conversion

public static implicit operator dc(AgentsDataFile instance)
public static implicit operator de(AgentsDataFile instance)
{
return instance._internal;
}

public static implicit operator AgentsDataFile(dc instance)
public static implicit operator AgentsDataFile(de instance)
{
return new AgentsDataFile(instance);
}
Expand Down
14 changes: 7 additions & 7 deletions Albion/Albion_Direct/Direct/BuildingDataFile.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////////
// Merlin API for Albion Online v1.11.362.117031-prod
// Merlin API for Albion Online v1.11.362.117521-prod
////////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
// <auto-generated>
Expand All @@ -21,18 +21,18 @@

namespace Albion_Direct
{
/* Internal type: ahz */
/* Internal type: ah6 */
public partial class BuildingDataFile : DataFile
{
private static List<MethodInfo> _methodReflectionPool = new List<MethodInfo>();
private static List<PropertyInfo> _propertyReflectionPool = new List<PropertyInfo>();
private static List<FieldInfo> _fieldReflectionPool = new List<FieldInfo>();

private ahz _internal;
private ah6 _internal;

#region Properties

public ahz BuildingDataFile_Internal => _internal;
public ah6 BuildingDataFile_Internal => _internal;

#endregion

Expand All @@ -48,7 +48,7 @@ public partial class BuildingDataFile : DataFile

#region Constructor

public BuildingDataFile(ahz instance) : base(instance)
public BuildingDataFile(ah6 instance) : base(instance)
{
_internal = instance;
}
Expand All @@ -62,12 +62,12 @@ static BuildingDataFile()

#region Conversion

public static implicit operator ahz(BuildingDataFile instance)
public static implicit operator ah6(BuildingDataFile instance)
{
return instance._internal;
}

public static implicit operator BuildingDataFile(ahz instance)
public static implicit operator BuildingDataFile(ah6 instance)
{
return new BuildingDataFile(instance);
}
Expand Down
Loading

0 comments on commit 6505bd9

Please sign in to comment.