From daecbc9f8c95d4eab8d2f909904d0f28f95489c0 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Mon, 28 Oct 2019 00:12:17 +0100
Subject: [PATCH] Move dnditem and dndspell to the rpg pack

---
 royalnet/packs/{royal => rpg}/commands/dnditem.py   | 3 +--
 royalnet/packs/{royal => rpg}/commands/dndspell.py  | 4 ++--
 royalnet/packs/rpg/utils/__init__.py                | 3 ++-
 royalnet/{ => packs/rpg}/utils/parse5etoolsentry.py | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename royalnet/packs/{royal => rpg}/commands/dnditem.py (97%)
 rename royalnet/packs/{royal => rpg}/commands/dndspell.py (98%)
 rename royalnet/{ => packs/rpg}/utils/parse5etoolsentry.py (100%)

diff --git a/royalnet/packs/royal/commands/dnditem.py b/royalnet/packs/rpg/commands/dnditem.py
similarity index 97%
rename from royalnet/packs/royal/commands/dnditem.py
rename to royalnet/packs/rpg/commands/dnditem.py
index 61cd3601..3aa470b3 100644
--- a/royalnet/packs/royal/commands/dnditem.py
+++ b/royalnet/packs/rpg/commands/dnditem.py
@@ -1,8 +1,7 @@
-import typing
 import aiohttp
 import sortedcontainers
 from royalnet.commands import *
-from royalnet.utils import parse_5etools_entry
+from ..utils import parse_5etools_entry
 
 
 class DnditemCommand(Command):
diff --git a/royalnet/packs/royal/commands/dndspell.py b/royalnet/packs/rpg/commands/dndspell.py
similarity index 98%
rename from royalnet/packs/royal/commands/dndspell.py
rename to royalnet/packs/rpg/commands/dndspell.py
index 3ced2dc4..6d645f06 100644
--- a/royalnet/packs/royal/commands/dndspell.py
+++ b/royalnet/packs/rpg/commands/dndspell.py
@@ -1,8 +1,8 @@
-import typing
 import aiohttp
 import sortedcontainers
 from royalnet.commands import *
-from royalnet.utils import parse_5etools_entry, ordinalformat, andformat
+from royalnet.utils import ordinalformat, andformat
+from ..utils import parse_5etools_entry
 
 
 class DndspellCommand(Command):
diff --git a/royalnet/packs/rpg/utils/__init__.py b/royalnet/packs/rpg/utils/__init__.py
index 2d229e83..affccc25 100644
--- a/royalnet/packs/rpg/utils/__init__.py
+++ b/royalnet/packs/rpg/utils/__init__.py
@@ -1,3 +1,4 @@
 from .dndproficiencytype import DndProficiencyType
+from .parse5etoolsentry import parse_5etools_entry
 
-__all__ = ["DndProficiencyType"]
+__all__ = ["DndProficiencyType", "parse_5etools_entry"]
diff --git a/royalnet/utils/parse5etoolsentry.py b/royalnet/packs/rpg/utils/parse5etoolsentry.py
similarity index 100%
rename from royalnet/utils/parse5etoolsentry.py
rename to royalnet/packs/rpg/utils/parse5etoolsentry.py