diff --git a/OpenDiablo2.Common/Enums/eHero.cs b/OpenDiablo2.Common/Enums/eHero.cs new file mode 100644 index 00000000..06782633 --- /dev/null +++ b/OpenDiablo2.Common/Enums/eHero.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenDiablo2.Common.Enums +{ + public enum eHero + { + Barbarian, + Necromancer, + Paladin, + Assassin, + Sorceress, + Amazon, + Druid + } +} diff --git a/OpenDiablo2.Common/Interfaces/IRenderWindow.cs b/OpenDiablo2.Common/Interfaces/IRenderWindow.cs index 142e7994..041aaf0e 100644 --- a/OpenDiablo2.Common/Interfaces/IRenderWindow.cs +++ b/OpenDiablo2.Common/Interfaces/IRenderWindow.cs @@ -24,6 +24,7 @@ namespace OpenDiablo2.Common.Interfaces ILabel CreateLabel(IFont font, Point position, string text); void Draw(ISprite sprite); void Draw(ISprite sprite, Point location); + void Draw(ISprite sprite, int frame, Point location); void Draw(ISprite sprite, int frame); void Draw(ISprite sprite, int xSegments, int ySegments, int offset); void Draw(ILabel label); diff --git a/OpenDiablo2.Common/OpenDiablo2.Common.csproj b/OpenDiablo2.Common/OpenDiablo2.Common.csproj index 08844ddf..e875c624 100644 --- a/OpenDiablo2.Common/OpenDiablo2.Common.csproj +++ b/OpenDiablo2.Common/OpenDiablo2.Common.csproj @@ -71,6 +71,7 @@ + diff --git a/OpenDiablo2.Common/ResourcePaths.cs b/OpenDiablo2.Common/ResourcePaths.cs index b8428530..84711cb2 100644 --- a/OpenDiablo2.Common/ResourcePaths.cs +++ b/OpenDiablo2.Common/ResourcePaths.cs @@ -74,6 +74,13 @@ namespace OpenDiablo2.Common public static string CharacterSelectDruidForwardWalk = "data\\global\\ui\\FrontEnd\\druid\\DZFW.DC6"; public static string CharacterSelectDruidBackWalk = "data\\global\\ui\\FrontEnd\\druid\\DZBW.DC6"; + // --- Game --- + public static string GamePanels = "data\\global\\ui\\PANEL\\800ctrlpnl7.dc6"; + public static string GameGlobeOverlap = "data\\global\\ui\\PANEL\\overlap.DC6"; + public static string HealthMana = "data\\global\\ui\\PANEL\\hlthmana.DC6"; + public static string GameSmallMenuButton = "data\\global\\ui\\PANEL\\menubutton.DC6"; // TODO: Used for inventory popout + public static string SkillIcon = "data\\global\\ui\\PANEL\\Skillicon.DC6"; + // --- Mouse Pointers --- public static string CursorDefault = "data\\global\\ui\\CURSOR\\ohand.DC6"; diff --git a/OpenDiablo2.Core/AutofacModule.cs b/OpenDiablo2.Core/AutofacModule.cs index 60168f1d..141de6b7 100644 --- a/OpenDiablo2.Core/AutofacModule.cs +++ b/OpenDiablo2.Core/AutofacModule.cs @@ -1,5 +1,6 @@ using Autofac; using OpenDiablo2.Common.Interfaces; +using OpenDiablo2.Core.GameState_; using OpenDiablo2.Core.UI; using System; using System.Collections.Generic; @@ -23,7 +24,7 @@ namespace OpenDiablo2.Core builder.RegisterType().As().SingleInstance(); builder.RegisterType