Skip to content

Commit 573c594

Browse files
pandinocoderpandinocoder
committed
rename ResourceBase -> ResourceDescriptor, ResourceState -> ResourceStateDescriptor
1 parent cd19ff2 commit 573c594

File tree

18 files changed

+97
-78
lines changed

18 files changed

+97
-78
lines changed

‎Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Intersect.Framework.Core.GameObjects.Items;
55
using Intersect.Framework.Core.GameObjects.Maps;
66
using Intersect.Framework.Core.GameObjects.NPCs;
7+
using Intersect.Framework.Core.GameObjects.Resources;
78
using Intersect.Framework.Core.GameObjects.Variables;
89
using Intersect.GameObjects;
910

@@ -29,7 +30,7 @@ public enum GameObjectType
2930
[GameObjectInfo(typeof(QuestDescriptor), "quests")]
3031
Quest,
3132

32-
[GameObjectInfo(typeof(ResourceBase), "resources")]
33+
[GameObjectInfo(typeof(ResourceDescriptor), "resources")]
3334
Resource,
3435

3536
[GameObjectInfo(typeof(ShopBase), "shops")]

‎Framework/Intersect.Framework.Core/GameObjects/Maps/Attributes/MapResourceAttribute.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Intersect.GameObjects;
1+
using Intersect.Framework.Core.GameObjects.Resources;
2+
using Intersect.GameObjects;
23
using Intersect.GameObjects.Annotations;
34

45
namespace Intersect.Framework.Core.GameObjects.Maps.Attributes;
@@ -8,7 +9,7 @@ public partial class MapResourceAttribute : MapAttribute
89
public override MapAttributeType Type => MapAttributeType.Resource;
910

1011
[EditorLabel("Attributes", "Resource")]
11-
[EditorReference(typeof(ResourceBase), nameof(ResourceBase.Name))]
12+
[EditorReference(typeof(ResourceDescriptor), nameof(ResourceDescriptor.Name))]
1213
public Guid ResourceId { get; set; }
1314

1415
[EditorLabel("Attributes", "ZDimension")]

Framework/Intersect.Framework.Core/GameObjects/ResourceBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
11
using System.ComponentModel.DataAnnotations.Schema;
22
using Intersect.Framework.Core.GameObjects.Conditions;
33
using Intersect.Framework.Core.GameObjects.Events;
4+
using Intersect.GameObjects;
45
using Intersect.Models;
5-
using Microsoft.EntityFrameworkCore;
66
using Newtonsoft.Json;
77

8-
namespace Intersect.GameObjects;
8+
namespace Intersect.Framework.Core.GameObjects.Resources;
99

10-
[Owned]
11-
public partial class ResourceState
12-
{
13-
public string Graphic { get; set; } = null;
14-
15-
public bool RenderBelowEntities { get; set; }
16-
17-
public bool GraphicFromTileset { get; set; }
18-
19-
public int X { get; set; }
20-
21-
public int Y { get; set; }
22-
23-
public int Width { get; set; }
24-
25-
public int Height { get; set; }
26-
}
27-
28-
public partial class ResourceBase : DatabaseObject<ResourceBase>, IFolderable
10+
public partial class ResourceDescriptor : DatabaseObject<ResourceDescriptor>, IFolderable
2911
{
3012
[NotMapped]
3113
public List<Drop> Drops { get; set; } = [];
@@ -36,25 +18,25 @@ public partial class ResourceBase : DatabaseObject<ResourceBase>, IFolderable
3618
public string CannotHarvestMessage { get; set; } = string.Empty;
3719

3820
[JsonConstructor]
39-
public ResourceBase(Guid id) : base(id)
21+
public ResourceDescriptor(Guid id) : base(id)
4022
{
4123
Name = "New Resource";
42-
Initial = new ResourceState();
43-
Exhausted = new ResourceState();
24+
Initial = new ResourceStateDescriptor();
25+
Exhausted = new ResourceStateDescriptor();
4426
}
4527

4628
//EF wants NO PARAMETERS!!!!!
47-
public ResourceBase()
29+
public ResourceDescriptor()
4830
{
4931
Name = "New Resource";
50-
Initial = new ResourceState();
51-
Exhausted = new ResourceState();
32+
Initial = new ResourceStateDescriptor();
33+
Exhausted = new ResourceStateDescriptor();
5234
}
5335

5436
// Graphics
55-
public ResourceState Initial { get; set; }
37+
public ResourceStateDescriptor Initial { get; set; }
5638

57-
public ResourceState Exhausted { get; set; }
39+
public ResourceStateDescriptor Exhausted { get; set; }
5840

5941
[Column("Animation")]
6042
public Guid AnimationId { get; set; }

‎Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceStateDescriptor.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using Microsoft.EntityFrameworkCore;
2+
3+
namespace Intersect.Framework.Core.GameObjects.Resources;
4+
5+
[Owned]
6+
public partial class ResourceStateDescriptor
7+
{
8+
public string Graphic { get; set; } = null;
9+
10+
public bool RenderBelowEntities { get; set; }
11+
12+
public bool GraphicFromTileset { get; set; }
13+
14+
public int X { get; set; }
15+
16+
public int Y { get; set; }
17+
18+
public int Width { get; set; }
19+
20+
public int Height { get; set; }
21+
}

‎Intersect.Client.Core/Entities/Resource.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Intersect.Client.Framework.Maps;
66
using Intersect.Client.General;
77
using Intersect.Enums;
8+
using Intersect.Framework.Core.GameObjects.Resources;
89
using Intersect.GameObjects;
910
using Intersect.Network.Packets.Server;
1011

@@ -19,14 +20,14 @@ public partial class Resource : Entity, IResource
1920
private bool _waitingForTilesets;
2021

2122
private bool _isDead;
22-
private ResourceBase? _descriptor;
23+
private ResourceDescriptor? _descriptor;
2324

2425
public Resource(Guid id, ResourceEntityPacket packet) : base(id, packet, EntityType.Resource)
2526
{
2627
mRenderPriority = 0;
2728
}
2829

29-
public ResourceBase? Descriptor
30+
public ResourceDescriptor? Descriptor
3031
{
3132
get => _descriptor;
3233
set => _descriptor = value;
@@ -109,15 +110,15 @@ public override void Load(EntityPacket? packet)
109110

110111
IsDead = resourceEntityPacket.IsDead;
111112

112-
if (!ResourceBase.TryGet(resourceEntityPacket.ResourceId, out _descriptor))
113+
if (!ResourceDescriptor.TryGet(resourceEntityPacket.ResourceId, out _descriptor))
113114
{
114115
return;
115116
}
116117

117118
UpdateFromDescriptor(_descriptor);
118119
}
119120

120-
private void UpdateFromDescriptor(ResourceBase? descriptor)
121+
private void UpdateFromDescriptor(ResourceDescriptor? descriptor)
121122
{
122123
if (descriptor == null)
123124
{
@@ -153,7 +154,7 @@ public override bool Update()
153154

154155
if (Descriptor is { IsDeleted: true } deletedDescriptor)
155156
{
156-
_ = ResourceBase.TryGet(deletedDescriptor.Id, out _descriptor);
157+
_ = ResourceDescriptor.TryGet(deletedDescriptor.Id, out _descriptor);
157158
UpdateFromDescriptor(_descriptor);
158159
}
159160

‎Intersect.Client.Framework/Entities/IResource.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
using Intersect.Framework.Core.GameObjects.Resources;
12
using Intersect.GameObjects;
23

34
namespace Intersect.Client.Framework.Entities;
45

56
public interface IResource : IEntity
67
{
7-
ResourceBase? Descriptor { get; }
8+
ResourceDescriptor? Descriptor { get; }
89

910
bool IsDepleted { get; }
1011
}

‎Intersect.Editor/Core/Graphics.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Intersect.Framework.Core.GameObjects.Events;
1212
using Intersect.Framework.Core.GameObjects.Maps;
1313
using Intersect.Framework.Core.GameObjects.Maps.Attributes;
14+
using Intersect.Framework.Core.GameObjects.Resources;
1415
using Intersect.GameObjects;
1516
using Intersect.Utilities;
1617
using Microsoft.Extensions.Logging;
@@ -1378,7 +1379,7 @@ bool alternate
13781379

13791380
if (tmpMap.Attributes[x, y].Type == MapAttributeType.Resource && !upper && !alternate)
13801381
{
1381-
var resource = ResourceBase.Get(((MapResourceAttribute) tmpMap.Attributes[x, y]).ResourceId);
1382+
var resource = ResourceDescriptor.Get(((MapResourceAttribute) tmpMap.Attributes[x, y]).ResourceId);
13821383
if (resource == null)
13831384
{
13841385
continue;

‎Intersect.Editor/Forms/DockingElements/frmMapLayers.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Intersect.Framework.Core.GameObjects.Maps.Attributes;
1010
using Intersect.Framework.Core.GameObjects.Maps.MapList;
1111
using Intersect.Framework.Core.GameObjects.NPCs;
12+
using Intersect.Framework.Core.GameObjects.Resources;
1213
using Intersect.GameObjects;
1314
using Intersect.Localization;
1415
using Intersect.Utilities;
@@ -528,7 +529,7 @@ private void rbSound_CheckedChanged(object sender, EventArgs e)
528529
private void rbResource_CheckedChanged(object sender, EventArgs e)
529530
{
530531
cmbResourceAttribute.Items.Clear();
531-
cmbResourceAttribute.Items.AddRange(ResourceBase.Names);
532+
cmbResourceAttribute.Items.AddRange(ResourceDescriptor.Names);
532533
if (cmbResourceAttribute.Items.Count > 0)
533534
{
534535
cmbResourceAttribute.SelectedIndex = 0;
@@ -731,7 +732,7 @@ public MapAttribute CreateAttribute()
731732

732733
case MapAttributeType.Resource:
733734
var resourceAttribute = attribute as MapResourceAttribute;
734-
resourceAttribute.ResourceId = ResourceBase.IdFromList(cmbResourceAttribute.SelectedIndex);
735+
resourceAttribute.ResourceId = ResourceDescriptor.IdFromList(cmbResourceAttribute.SelectedIndex);
735736
resourceAttribute.SpawnLevel = (byte)(rbLevel1.Checked ? 0 : 1);
736737
break;
737738

‎Intersect.Editor/Forms/Editors/frmResource.cs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Intersect.Enums;
99
using Intersect.Framework.Core.GameObjects.Events;
1010
using Intersect.Framework.Core.GameObjects.Items;
11+
using Intersect.Framework.Core.GameObjects.Resources;
1112
using Intersect.GameObjects;
1213
using Intersect.Utilities;
1314
using EventDescriptor = Intersect.Framework.Core.GameObjects.Events.EventDescriptor;
@@ -18,11 +19,11 @@ namespace Intersect.Editor.Forms.Editors;
1819
public partial class FrmResource : EditorForm
1920
{
2021

21-
private List<ResourceBase> mChanged = [];
22+
private List<ResourceDescriptor> mChanged = [];
2223

2324
private string mCopiedItem;
2425

25-
private ResourceBase mEditorItem;
26+
private ResourceDescriptor mEditorItem;
2627

2728
private Bitmap mEndBitmap;
2829

@@ -61,7 +62,7 @@ public FrmResource()
6162
}
6263
private void AssignEditorItem(Guid id)
6364
{
64-
mEditorItem = ResourceBase.Get(id);
65+
mEditorItem = ResourceDescriptor.Get(id);
6566
UpdateEditor();
6667
}
6768

@@ -70,7 +71,7 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type)
7071
if (type == GameObjectType.Resource)
7172
{
7273
InitEditor();
73-
if (mEditorItem != null && !ResourceBase.Lookup.Values.Contains(mEditorItem))
74+
if (mEditorItem != null && !ResourceDescriptor.Lookup.Values.Contains(mEditorItem))
7475
{
7576
mEditorItem = null;
7677
UpdateEditor();
@@ -892,15 +893,15 @@ public void InitEditor()
892893
{
893894
//Collect folders
894895
var mFolders = new List<string>();
895-
foreach (var itm in ResourceBase.Lookup)
896+
foreach (var itm in ResourceDescriptor.Lookup)
896897
{
897-
if (!string.IsNullOrEmpty(((ResourceBase) itm.Value).Folder) &&
898-
!mFolders.Contains(((ResourceBase) itm.Value).Folder))
898+
if (!string.IsNullOrEmpty(((ResourceDescriptor) itm.Value).Folder) &&
899+
!mFolders.Contains(((ResourceDescriptor) itm.Value).Folder))
899900
{
900-
mFolders.Add(((ResourceBase) itm.Value).Folder);
901-
if (!mKnownFolders.Contains(((ResourceBase) itm.Value).Folder))
901+
mFolders.Add(((ResourceDescriptor) itm.Value).Folder);
902+
if (!mKnownFolders.Contains(((ResourceDescriptor) itm.Value).Folder))
902903
{
903-
mKnownFolders.Add(((ResourceBase) itm.Value).Folder);
904+
mKnownFolders.Add(((ResourceDescriptor) itm.Value).Folder);
904905
}
905906
}
906907
}
@@ -911,8 +912,8 @@ public void InitEditor()
911912
cmbFolder.Items.Add("");
912913
cmbFolder.Items.AddRange(mKnownFolders.ToArray());
913914

914-
var items = ResourceBase.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,
915-
new KeyValuePair<string, string>(((ResourceBase)pair.Value)?.Name ?? Models.DatabaseObject<ResourceBase>.Deleted, ((ResourceBase)pair.Value)?.Folder ?? ""))).ToArray();
915+
var items = ResourceDescriptor.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,
916+
new KeyValuePair<string, string>(((ResourceDescriptor)pair.Value)?.Name ?? Models.DatabaseObject<ResourceDescriptor>.Deleted, ((ResourceDescriptor)pair.Value)?.Folder ?? ""))).ToArray();
916917
lstGameObjects.Repopulate(items, mFolders, btnAlphabetical.Checked, CustomSearch(), txtSearch.Text);
917918
}
918919

‎Intersect.Editor/Networking/PacketHandler.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Intersect.Framework.Core.GameObjects.Maps;
1212
using Intersect.Framework.Core.GameObjects.Maps.MapList;
1313
using Intersect.Framework.Core.GameObjects.NPCs;
14+
using Intersect.Framework.Core.GameObjects.Resources;
1415
using Intersect.Framework.Core.GameObjects.Variables;
1516
using Intersect.GameObjects;
1617
using Intersect.Network;
@@ -563,14 +564,14 @@ public void HandlePacket(IPacketSender packetSender, GameObjectPacket packet)
563564
case GameObjectType.Resource:
564565
if (deleted)
565566
{
566-
var res = ResourceBase.Get(id);
567+
var res = ResourceDescriptor.Get(id);
567568
res.Delete();
568569
}
569570
else
570571
{
571-
var res = new ResourceBase(id);
572+
var res = new ResourceDescriptor(id);
572573
res.Load(json);
573-
ResourceBase.Lookup.Set(id, res);
574+
ResourceDescriptor.Lookup.Set(id, res);
574575
}
575576

576577
break;

0 commit comments

Comments
 (0)