Skip to content

Commit efcfb17

Browse files
committed
move ClassItem/Spell/Sprite into their own files, change namespaces
1 parent 2f00c8c commit efcfb17

File tree

6 files changed

+50
-36
lines changed

6 files changed

+50
-36
lines changed

Framework/Intersect.Framework.Core/GameObjects/ClassBase.cs

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.ComponentModel.DataAnnotations.Schema;
22
using Intersect.Enums;
3+
using Intersect.Framework.Core.GameObjects.PlayerClass;
34
using Intersect.GameObjects.Maps;
45
using Intersect.Models;
56
using Intersect.Server.Utilities;
@@ -331,39 +332,4 @@ public long ExperienceToNextLevel(int level)
331332

332333
return ExperienceCurve.Calculate(level);
333334
}
334-
}
335-
336-
public partial class ClassItem
337-
{
338-
[JsonProperty]
339-
public Guid Id { get; set; }
340-
341-
public int Quantity { get; set; }
342-
343-
public ItemBase Get()
344-
{
345-
return ItemBase.Get(Id);
346-
}
347-
}
348-
349-
public partial class ClassSpell
350-
{
351-
[JsonProperty]
352-
public Guid Id { get; set; }
353-
354-
public int Level { get; set; }
355-
356-
public SpellBase Get()
357-
{
358-
return SpellBase.Get(Id);
359-
}
360-
}
361-
362-
public partial class ClassSprite
363-
{
364-
public string Face = string.Empty;
365-
366-
public Gender Gender;
367-
368-
public string Sprite = string.Empty;
369-
}
335+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using Intersect.GameObjects;
2+
using Newtonsoft.Json;
3+
4+
namespace Intersect.Framework.Core.GameObjects.PlayerClass;
5+
6+
public partial class ClassItem
7+
{
8+
[JsonProperty]
9+
public Guid Id { get; set; }
10+
11+
public int Quantity { get; set; }
12+
13+
public ItemBase Get()
14+
{
15+
return ItemBase.Get(Id);
16+
}
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using Intersect.GameObjects;
2+
using Newtonsoft.Json;
3+
4+
namespace Intersect.Framework.Core.GameObjects.PlayerClass;
5+
6+
public partial class ClassSpell
7+
{
8+
[JsonProperty]
9+
public Guid Id { get; set; }
10+
11+
public int Level { get; set; }
12+
13+
public SpellBase Get()
14+
{
15+
return SpellBase.Get(Id);
16+
}
17+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Intersect.Enums;
2+
3+
namespace Intersect.Framework.Core.GameObjects.PlayerClass;
4+
5+
public partial class ClassSprite
6+
{
7+
public string Face { get; set; } = string.Empty;
8+
9+
public Gender Gender { get; set; }
10+
11+
public string Sprite { get; set; } = string.Empty;
12+
}

Intersect.Client.Core/Interface/Menu/CharacterCreationWindow.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Intersect.Client.Localization;
1212
using Intersect.Client.Networking;
1313
using Intersect.Core;
14+
using Intersect.Framework.Core.GameObjects.PlayerClass;
1415
using Intersect.Framework.Reflection;
1516
using Intersect.GameObjects;
1617
using Intersect.Utilities;

Intersect.Server.Core/Database/DbInterface.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Intersect.Config;
1111
using Intersect.Core;
1212
using Intersect.Enums;
13+
using Intersect.Framework.Core.GameObjects.PlayerClass;
1314
using Intersect.Framework.Core.GameObjects.Variables;
1415
using Intersect.Framework.Reflection;
1516
using Intersect.GameObjects;

0 commit comments

Comments
 (0)