From 294217f0c8be6f4ad55c959c5d6a4b407e756a2a Mon Sep 17 00:00:00 2001
From: juliancoffee <lightdarkdaughter@gmail.com>
Date: Fri, 17 Sep 2021 20:07:39 +0300
Subject: [PATCH] Clean entity assets for a small bit

- Move loot_tables/creature/witch to loot_tables/spots/witch
- Move skillset/spots/general_max and skillset/spots/sceptre_max to
  skillset/preset/max/{general,sceptre}
- Remove tabs from dwarf_grave_robber entity config file
---
 assets/common/entity/spot/dwarf_grave_robber.ron              | 4 ++--
 assets/common/entity/spot/witch_dark.ron                      | 2 +-
 assets/common/loot_tables/{creature => spots}/witch.ron       | 0
 .../{spots/general_max.ron => preset/max/general.ron}         | 0
 .../{spots/sceptre_max.ron => preset/max/sceptre.ron}         | 0
 assets/common/skillset/spots/witch.ron                        | 4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename assets/common/loot_tables/{creature => spots}/witch.ron (100%)
 rename assets/common/skillset/{spots/general_max.ron => preset/max/general.ron} (100%)
 rename assets/common/skillset/{spots/sceptre_max.ron => preset/max/sceptre.ron} (100%)

diff --git a/assets/common/entity/spot/dwarf_grave_robber.ron b/assets/common/entity/spot/dwarf_grave_robber.ron
index 236e4d74c5..48c6f06daa 100644
--- a/assets/common/entity/spot/dwarf_grave_robber.ron
+++ b/assets/common/entity/spot/dwarf_grave_robber.ron
@@ -1,11 +1,11 @@
 EntityConfig (
     name: Name("Grave Robber"),
     body: RandomWith("dwarf"),
-	alignment: Alignment(Enemy),
+    alignment: Alignment(Enemy),
 
     loot: LootTable("common.loot_tables.creature.humanoid"),
 
-	hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")),
+    hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")),
 
     meta: [
         SkillSetAsset("common.skillset.village.guard"),
diff --git a/assets/common/entity/spot/witch_dark.ron b/assets/common/entity/spot/witch_dark.ron
index 8bc0670d08..4d62184240 100644
--- a/assets/common/entity/spot/witch_dark.ron
+++ b/assets/common/entity/spot/witch_dark.ron
@@ -13,7 +13,7 @@ EntityConfig (
     ))),
     alignment: Alignment(Enemy),
 
-    loot: LootTable("common.loot_tables.creature.witch"),
+    loot: LootTable("common.loot_tables.spots.witch"),
 
     hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")),
 
diff --git a/assets/common/loot_tables/creature/witch.ron b/assets/common/loot_tables/spots/witch.ron
similarity index 100%
rename from assets/common/loot_tables/creature/witch.ron
rename to assets/common/loot_tables/spots/witch.ron
diff --git a/assets/common/skillset/spots/general_max.ron b/assets/common/skillset/preset/max/general.ron
similarity index 100%
rename from assets/common/skillset/spots/general_max.ron
rename to assets/common/skillset/preset/max/general.ron
diff --git a/assets/common/skillset/spots/sceptre_max.ron b/assets/common/skillset/preset/max/sceptre.ron
similarity index 100%
rename from assets/common/skillset/spots/sceptre_max.ron
rename to assets/common/skillset/preset/max/sceptre.ron
diff --git a/assets/common/skillset/spots/witch.ron b/assets/common/skillset/spots/witch.ron
index e3ab4a47aa..e43d456499 100644
--- a/assets/common/skillset/spots/witch.ron
+++ b/assets/common/skillset/spots/witch.ron
@@ -1,4 +1,4 @@
 ([
-    Tree("common.skillset.spots.general_max"),
-    Tree("common.skillset.spots.sceptre_max"),    
+    Tree("common.skillset.preset.max.general"),
+    Tree("common.skillset.preset.max.sceptre"),
 ])