Allow for splitting activites and items data files into multiple files, and start doing so

4 files changed, 743 insertions, 743 deletions

diff --git a/data/activities/floret.yml b/data/activities/floret.yml
new file mode 100644
index 0000000..71b6136
--- /dev/null
+++ b/data/activities/floret.yml
@@ -0,0 +1,532 @@
+planequarry_floret_mines:
+  name: "Quarry Floret Mines"
+  description: "Planequarry at the Floret Mines."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "planequarry"
+        level: 1
+      - type: "equipment"
+        tag: "pickaxe"
+    duration:
+      base: 70
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "planequarry"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "planequarry_speed"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "stone"
+            score: 0
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "crude_iron_ore"
+            score: 0
+            xp:
+              - gid: "planequarry"
+                value: 5
+          - gid: "iron_ore"
+            score: 0.95
+            xp:
+              - gid: "planequarry"
+                value: 6
+          - gid: "pure_iron_ore"
+            score: 0.996
+            xp:
+              - gid: "planequarry"
+                value: 7
+      - type: "item"
+        chance: 0.02
+        table:
+          - gid: "red_beryl"
+            score: 0
+            xp:
+              - gid: "planequarry"
+                value: 5
+          - gid: "tourmaline"
+            score: 0.45
+            xp:
+              - gid: "planequarry"
+                value: 5
+          - gid: "yellow_beryl"
+            score: 0.90
+            xp:
+              - gid: "planequarry"
+                value: 7
+            titles:
+              - gid: "beryly"
+          - gid: "paraiba_tourmaline"
+            score: 0.95
+            xp:
+              - gid: "planequarry"
+                value: 7
+planequarry_deepshaft:
+  name: "Quarry Deepshaft"
+  description: "Descend far below the the Floret Mines into the labyrinth of shafts left behind by the ancients."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "planequarry"
+        level: 10
+      - type: "equipment"
+        tag: "pickaxe"
+    duration:
+      base: 80
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "planequarry"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "planequarry_speed"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "stone"
+            score: 0
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "crude_iron_ore"
+            score: 0
+            xp:
+              - gid: "planequarry"
+                value: 5
+          - gid: "iron_ore"
+            score: 0.20
+            xp:
+              - gid: "planequarry"
+                value: 6
+          - gid: "pure_iron_ore"
+            score: 0.90
+            xp:
+              - gid: "planequarry"
+                value: 7
+          - gid: "gaian_ore"
+            score: 0.995
+            xp:
+              - gid: "planequarry"
+                value: 9
+      - type: "item"
+        chance: 0.03
+        table:
+          - gid: "red_beryl"
+            score: 0
+            xp:
+              - gid: "planequarry"
+                value: 5
+          - gid: "tourmaline"
+            score: 0.45
+            xp:
+              - gid: "planequarry"
+                value: 5
+          - gid: "yellow_beryl"
+            score: 0.90
+            xp:
+              - gid: "planequarry"
+                value: 7
+            titles:
+              - gid: "beryly"
+          - gid: "paraiba_tourmaline"
+            score: 0.95
+            xp:
+              - gid: "planequarry"
+                value: 7
+planequarry_brine_trench:
+  name: "Quarry Brine Trench"
+  description: "Planequarry in the south Floret brine trench."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "planequarry"
+        level: 1
+      - type: "equipment"
+        tag: "pickaxe"
+    duration:
+      base: 50
+      minimum: 25
+      scaling:
+        - type: "skill"
+          gid: "planequarry"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "planequarry_speed"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        gid: "salt"
+        max_quantity: 3
+        xp:
+          - gid: "planequarry"
+            value: 2
+      - type: "item"
+        chance: 0.0133
+        gid: "seas_tear"
+        xp:
+          - gid: "planequarry"
+            value: 5
+beastslay_killing_fields:
+  name: "Slay in the Killing Fields"
+  description: "Hunt monsters in the Killing Fields."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "beastslay"
+        level: 1
+    duration:
+      base: 60
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "beastslay"
+          scale_value: 0.5
+    results:
+      - type: "monster"
+        chance: 1
+        table:
+          - gid: "pit_leech"
+            score: 0
+          - gid: "stalk_beast"
+            score: 0.40
+          - gid: "grinpad"
+            score: 0.70
+          - gid: "lesser_trodgeathomp"
+            score: 0.98
+beastslay_hopegraves:
+  name: "Slay in the Hopegraves"
+  description: "Hunt monsters in the Hopegraves."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "beastslay"
+        level: 1
+    duration:
+      base: 70
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "beastslay"
+          scale_value: 1
+    results:
+      - type: "monster"
+        chance: 1
+        table:
+          - gid: "grinpad"
+            score: 0
+          - gid: "bollyrot"
+            score: 0.45
+          - gid: "crypt_writhe"
+            score: 0.96
+wealdreap_twil_woods:
+  name: "Reap Twil Woods"
+  description: "Wealdreap within Twil Woods."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "wealdreap"
+        level: 1
+      - type: "equipment"
+        tag: "axe"
+    duration:
+      base: 60
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "wealdreap"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "wealdreap_speed"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "wood"
+            score: 0
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "pluma_moss"
+            score: 0.10
+            xp:
+              - gid: "wealdreap"
+                value: 1
+          - gid: "burstshroom"
+            score: 0.40
+            xp:
+              - gid: "wealdreap"
+                value: 5
+          - gid: "aseas_leaf"
+            score: 0.70
+            xp:
+              - gid: "wealdreap"
+                value: 5
+          - gid: "shrine_hassock"
+            score: 0.98
+            xp:
+              - gid: "wealdreap"
+                value: 8
+          - gid: "discord_pome"
+            score: 0.996
+            xp:
+              - gid: "wealdreap"
+                value: 9
+      - type: "item"
+        chance: 0.02
+        table:
+          - gid: "mudtub_seed"
+            score: 0
+            max_quantity: 3
+            xp:
+              - gid: "wealdreap"
+                value: 5
+          - gid: "midoras_seed"
+            score: 0.45
+            max_quantity: 3
+            xp:
+              - gid: "wealdreap"
+                value: 6
+          - gid: "templis_seed"
+            score: 0.90
+            max_quantity: 3
+            xp:
+              - gid: "wealdreap"
+                value: 7
+wealdreap_twil_grove:
+  name: "Reap Twil Grove"
+  description: "Wealdreap within the hidden woodways of the Twil Woods Grove."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "wealdreap"
+        level: 10
+      - type: "equipment"
+        tag: "axe"
+    duration:
+      base: 90
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "wealdreap"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "wealdreap_speed"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "laris_strand"
+            score: 0.10
+            xp:
+              - gid: "wealdreap"
+                value: 2
+          - gid: "woodrun_bloom"
+            score: 0.40
+            xp:
+              - gid: "wealdreap"
+                value: 6
+          - gid: "last_breath"
+            score: 0.70
+            xp:
+              - gid: "wealdreap"
+                value: 6
+          - gid: "silver_iris"
+            score: 0.98
+            xp:
+              - gid: "wealdreap"
+                value: 9
+          - gid: "claritas_flower"
+            score: 0.996
+            xp:
+              - gid: "wealdreap"
+                value: 10
+      - type: "item"
+        chance: 0.02
+        table:
+          - gid: "mudtub_seed"
+            score: 0
+            max_quantity: 3
+            xp:
+              - gid: "wealdreap"
+                value: 5
+          - gid: "midoras_seed"
+            score: 0.30
+            max_quantity: 3
+            xp:
+              - gid: "wealdreap"
+                value: 6
+          - gid: "templis_seed"
+            score: 0.60
+            max_quantity: 3
+            xp:
+              - gid: "wealdreap"
+                value: 7
+          - gid: "enzon_seed"
+            score: 0.90
+            max_quantity: 3
+            xp:
+              - gid: "wealdreap"
+                value: 8
+manatrawl_sor_well:
+  name: "Trawl Sor Well"
+  description: "Manatrawl within Sor Well."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "manatrawl"
+        level: 1
+      - type: "equipment"
+        tag: "aethermesh"
+    duration:
+      base: 60
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "manatrawl"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "manatrawl_speed"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "arcane_dust"
+            score: 0
+            max_quantity: 2
+            xp:
+              - gid: "manatrawl"
+                value: 2
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "shimmering_essence"
+            score: 0.934
+            xp:
+              - gid: "manatrawl"
+                value: 7
+          - gid: "wisp_of_the_current"
+            score: 0.996
+            xp:
+              - gid: "manatrawl"
+                value: 10
+manatrawl_sor_well_depths:
+  name: "Trawl Sor Well Depths"
+  description: "Manatrawl deep within Sor Well."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "manatrawl"
+        level: 7
+      - type: "equipment"
+        tag: "aethermesh"
+    duration:
+      base: 70
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "manatrawl"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "manatrawl_speed"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "arcane_dust"
+            score: 0
+            max_quantity: 3
+            xp:
+              - gid: "manatrawl"
+                value: 2
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "shimmering_essence"
+            score: 0.934
+            max_quantity: 2
+            xp:
+              - gid: "manatrawl"
+                value: 7
+          - gid: "wisp_of_the_current"
+            score: 0.995
+            xp:
+              - gid: "manatrawl"
+                value: 10
+wildscour_crumbling_ruins:
+  name: "Scour Crumbling Ruins"
+  description: "Wildscour within the crumbling ruins."
+  location: "floret"
+  whatnot:
+    requirements:
+      - type: "skill"
+        gid: "wildscour"
+        level: 1
+    duration:
+      base: 60
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "wildscour"
+          scale_value: 1
+    results:
+      - type: "item"
+        chance: 1
+        table:
+          - gid: "vestige"
+            score: 0.35
+            max_quantity: 5
+            xp:
+              - gid: "wildscour"
+                value: 2
+          - gid: "aethermesh"
+            score: 0.50
+            xp:
+              - gid: "wildscour"
+                value: 2
+          - gid: "stone_spade"
+            score: 0.60
+            xp:
+              - gid: "wildscour"
+                value: 2
+          - gid: "stone_pickaxe"
+            score: 0.70
+            xp:
+              - gid: "wildscour"
+                value: 2
+          - gid: "stone_axe"
+            score: 0.80
+            xp:
+              - gid: "wildscour"
+                value: 2
+          - gid: "simple_spellpage"
+            score: 0.99
+            xp:
+              - gid: "wildscour"
+                value: 7
+          - gid: "disturbing_doodad"
+            score: 0.998
+            xp:
+              - gid: "wildscour"
+                value: 10
diff --git a/data/activities.yml b/data/activities/general.yml
index 06f385c..6f624a1 100644
--- a/data/activities.yml
+++ b/data/activities/general.yml
@@ -2236,482 +2236,6 @@ craft_mercuria_potion:
         xp:
           - gid: "fluxseethe"
             value: 38
-planequarry_floret_mines:
-  name: "Quarry Floret Mines"
-  description: "Planequarry at the Floret Mines."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "planequarry"
-        level: 1
-      - type: "equipment"
-        tag: "pickaxe"
-    duration:
-      base: 70
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "planequarry"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "planequarry_speed"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "stone"
-            score: 0
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "crude_iron_ore"
-            score: 0
-            xp:
-              - gid: "planequarry"
-                value: 5
-          - gid: "iron_ore"
-            score: 0.95
-            xp:
-              - gid: "planequarry"
-                value: 6
-          - gid: "pure_iron_ore"
-            score: 0.996
-            xp:
-              - gid: "planequarry"
-                value: 7
-      - type: "item"
-        chance: 0.02
-        table:
-          - gid: "red_beryl"
-            score: 0
-            xp:
-              - gid: "planequarry"
-                value: 5
-          - gid: "tourmaline"
-            score: 0.45
-            xp:
-              - gid: "planequarry"
-                value: 5
-          - gid: "yellow_beryl"
-            score: 0.90
-            xp:
-              - gid: "planequarry"
-                value: 7
-            titles:
-              - gid: "beryly"
-          - gid: "paraiba_tourmaline"
-            score: 0.95
-            xp:
-              - gid: "planequarry"
-                value: 7
-planequarry_deepshaft:
-  name: "Quarry Deepshaft"
-  description: "Descend far below the the Floret Mines into the labyrinth of shafts left behind by the ancients."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "planequarry"
-        level: 10
-      - type: "equipment"
-        tag: "pickaxe"
-    duration:
-      base: 80
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "planequarry"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "planequarry_speed"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "stone"
-            score: 0
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "crude_iron_ore"
-            score: 0
-            xp:
-              - gid: "planequarry"
-                value: 5
-          - gid: "iron_ore"
-            score: 0.20
-            xp:
-              - gid: "planequarry"
-                value: 6
-          - gid: "pure_iron_ore"
-            score: 0.90
-            xp:
-              - gid: "planequarry"
-                value: 7
-          - gid: "gaian_ore"
-            score: 0.995
-            xp:
-              - gid: "planequarry"
-                value: 9
-      - type: "item"
-        chance: 0.03
-        table:
-          - gid: "red_beryl"
-            score: 0
-            xp:
-              - gid: "planequarry"
-                value: 5
-          - gid: "tourmaline"
-            score: 0.45
-            xp:
-              - gid: "planequarry"
-                value: 5
-          - gid: "yellow_beryl"
-            score: 0.90
-            xp:
-              - gid: "planequarry"
-                value: 7
-            titles:
-              - gid: "beryly"
-          - gid: "paraiba_tourmaline"
-            score: 0.95
-            xp:
-              - gid: "planequarry"
-                value: 7
-planequarry_brine_trench:
-  name: "Quarry Brine Trench"
-  description: "Planequarry in the south Floret brine trench."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "planequarry"
-        level: 1
-      - type: "equipment"
-        tag: "pickaxe"
-    duration:
-      base: 50
-      minimum: 25
-      scaling:
-        - type: "skill"
-          gid: "planequarry"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "planequarry_speed"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        gid: "salt"
-        max_quantity: 3
-        xp:
-          - gid: "planequarry"
-            value: 2
-      - type: "item"
-        chance: 0.0133
-        gid: "seas_tear"
-        xp:
-          - gid: "planequarry"
-            value: 5
-beastslay_killing_fields:
-  name: "Slay in the Killing Fields"
-  description: "Hunt monsters in the Killing Fields."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "beastslay"
-        level: 1
-    duration:
-      base: 60
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "beastslay"
-          scale_value: 0.5
-    results:
-      - type: "monster"
-        chance: 1
-        table:
-          - gid: "pit_leech"
-            score: 0
-          - gid: "stalk_beast"
-            score: 0.40
-          - gid: "grinpad"
-            score: 0.70
-          - gid: "lesser_trodgeathomp"
-            score: 0.98
-beastslay_hopegraves:
-  name: "Slay in the Hopegraves"
-  description: "Hunt monsters in the Hopegraves."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "beastslay"
-        level: 1
-    duration:
-      base: 70
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "beastslay"
-          scale_value: 1
-    results:
-      - type: "monster"
-        chance: 1
-        table:
-          - gid: "grinpad"
-            score: 0
-          - gid: "bollyrot"
-            score: 0.45
-          - gid: "crypt_writhe"
-            score: 0.96
-wealdreap_twil_woods:
-  name: "Reap Twil Woods"
-  description: "Wealdreap within Twil Woods."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "wealdreap"
-        level: 1
-      - type: "equipment"
-        tag: "axe"
-    duration:
-      base: 60
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "wealdreap"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "wealdreap_speed"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "wood"
-            score: 0
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "pluma_moss"
-            score: 0.10
-            xp:
-              - gid: "wealdreap"
-                value: 1
-          - gid: "burstshroom"
-            score: 0.40
-            xp:
-              - gid: "wealdreap"
-                value: 5
-          - gid: "aseas_leaf"
-            score: 0.70
-            xp:
-              - gid: "wealdreap"
-                value: 5
-          - gid: "shrine_hassock"
-            score: 0.98
-            xp:
-              - gid: "wealdreap"
-                value: 8
-          - gid: "discord_pome"
-            score: 0.996
-            xp:
-              - gid: "wealdreap"
-                value: 9
-      - type: "item"
-        chance: 0.02
-        table:
-          - gid: "mudtub_seed"
-            score: 0
-            max_quantity: 3
-            xp:
-              - gid: "wealdreap"
-                value: 5
-          - gid: "midoras_seed"
-            score: 0.45
-            max_quantity: 3
-            xp:
-              - gid: "wealdreap"
-                value: 6
-          - gid: "templis_seed"
-            score: 0.90
-            max_quantity: 3
-            xp:
-              - gid: "wealdreap"
-                value: 7
-wealdreap_twil_grove:
-  name: "Reap Twil Grove"
-  description: "Wealdreap within the hidden woodways of the Twil Woods Grove."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "wealdreap"
-        level: 10
-      - type: "equipment"
-        tag: "axe"
-    duration:
-      base: 90
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "wealdreap"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "wealdreap_speed"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "laris_strand"
-            score: 0.10
-            xp:
-              - gid: "wealdreap"
-                value: 2
-          - gid: "woodrun_bloom"
-            score: 0.40
-            xp:
-              - gid: "wealdreap"
-                value: 6
-          - gid: "last_breath"
-            score: 0.70
-            xp:
-              - gid: "wealdreap"
-                value: 6
-          - gid: "silver_iris"
-            score: 0.98
-            xp:
-              - gid: "wealdreap"
-                value: 9
-          - gid: "claritas_flower"
-            score: 0.996
-            xp:
-              - gid: "wealdreap"
-                value: 10
-      - type: "item"
-        chance: 0.02
-        table:
-          - gid: "mudtub_seed"
-            score: 0
-            max_quantity: 3
-            xp:
-              - gid: "wealdreap"
-                value: 5
-          - gid: "midoras_seed"
-            score: 0.30
-            max_quantity: 3
-            xp:
-              - gid: "wealdreap"
-                value: 6
-          - gid: "templis_seed"
-            score: 0.60
-            max_quantity: 3
-            xp:
-              - gid: "wealdreap"
-                value: 7
-          - gid: "enzon_seed"
-            score: 0.90
-            max_quantity: 3
-            xp:
-              - gid: "wealdreap"
-                value: 8
-manatrawl_sor_well:
-  name: "Trawl Sor Well"
-  description: "Manatrawl within Sor Well."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "manatrawl"
-        level: 1
-      - type: "equipment"
-        tag: "aethermesh"
-    duration:
-      base: 60
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "manatrawl"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "manatrawl_speed"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "arcane_dust"
-            score: 0
-            max_quantity: 2
-            xp:
-              - gid: "manatrawl"
-                value: 2
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "shimmering_essence"
-            score: 0.934
-            xp:
-              - gid: "manatrawl"
-                value: 7
-          - gid: "wisp_of_the_current"
-            score: 0.996
-            xp:
-              - gid: "manatrawl"
-                value: 10
-manatrawl_sor_well_depths:
-  name: "Trawl Sor Well Depths"
-  description: "Manatrawl deep within Sor Well."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "manatrawl"
-        level: 7
-      - type: "equipment"
-        tag: "aethermesh"
-    duration:
-      base: 70
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "manatrawl"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "manatrawl_speed"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "arcane_dust"
-            score: 0
-            max_quantity: 3
-            xp:
-              - gid: "manatrawl"
-                value: 2
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "shimmering_essence"
-            score: 0.934
-            max_quantity: 2
-            xp:
-              - gid: "manatrawl"
-                value: 7
-          - gid: "wisp_of_the_current"
-            score: 0.995
-            xp:
-              - gid: "manatrawl"
-                value: 10
 synthsever_rusted_lockbox:
   name: "Unlock Rusted Lockbox"
   description: "Unseal the lock on a rusted lockbox."
@@ -2773,62 +2297,6 @@ open_unlocked_rusted_lockbox:
             score: 0.90
           - gid: "granite_ring"
             score: 0.95
-wildscour_crumbling_ruins:
-  name: "Scour Crumbling Ruins"
-  description: "Wildscour within the crumbling ruins."
-  location: "floret"
-  whatnot:
-    requirements:
-      - type: "skill"
-        gid: "wildscour"
-        level: 1
-    duration:
-      base: 60
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "wildscour"
-          scale_value: 1
-    results:
-      - type: "item"
-        chance: 1
-        table:
-          - gid: "vestige"
-            score: 0.35
-            max_quantity: 5
-            xp:
-              - gid: "wildscour"
-                value: 2
-          - gid: "aethermesh"
-            score: 0.50
-            xp:
-              - gid: "wildscour"
-                value: 2
-          - gid: "stone_spade"
-            score: 0.60
-            xp:
-              - gid: "wildscour"
-                value: 2
-          - gid: "stone_pickaxe"
-            score: 0.70
-            xp:
-              - gid: "wildscour"
-                value: 2
-          - gid: "stone_axe"
-            score: 0.80
-            xp:
-              - gid: "wildscour"
-                value: 2
-          - gid: "simple_spellpage"
-            score: 0.99
-            xp:
-              - gid: "wildscour"
-                value: 7
-          - gid: "disturbing_doodad"
-            score: 0.998
-            xp:
-              - gid: "wildscour"
-                value: 10
 craft_gem_dust_from_red_beryl:
   name: "Crush red beryl"
   description: "Crush a red beryl into gem dust."
@@ -3318,214 +2786,3 @@ craft_minor_mana:
         xp:
           - gid: "omenbind"
             value: 16
-havencast_light:
-  name: "Cast Light"
-  description: "Risk a little light."
-  whatnot:
-    tags:
-      - "spell"
-      - "cantrip"
-    requirements:
-      - type: "skill"
-        gid: "havencast"
-        level: 1
-      - type: "stat"
-        gid: "mana"
-        value: 1
-    duration:
-      base: 62
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "havencast"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "havencast_speed"
-          scale_value: 1
-    results:
-      - type: "condition"
-        gid: "light"
-        duration: 3600 # 1 Hour
-        message: "A ball of light glows before you."
-      - type: "xp"
-        gid: "havencast"
-        base: 2
-havencast_dazzle:
-  name: "Cast Dazzle"
-  description: "Cast the Dazzle cantrip."
-  whatnot:
-    tags:
-      - "spell"
-      - "cantrip"
-    duration:
-      base: 62
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "havencast"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "havencast_speed"
-          scale_value: 1
-    requirements:
-      - type: "skill"
-        gid: "havencast"
-        level: 2
-      - type: "stat"
-        gid: "mana"
-        value: 1
-    results:
-      - type: "condition"
-        gid: "dazzle"
-        duration: 600 # 10 minutes
-        message: "Sparkling lights distract your enemies."
-      - type: "xp"
-        gid: "havencast"
-        base: 3
-havencast_decipher_simple_magicscript:
-  name: "Cast Decipher Simple Magicscript"
-  description: "Cast the Decipher Simple Magicscript cantrip."
-  whatnot:
-    tags:
-      - "spell"
-      - "cantrip"
-    duration:
-      base: 64
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "havencast"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "havencast_speed"
-          scale_value: 1
-    requirements:
-      - type: "skill"
-        gid: "havencast"
-        level: 3
-      - type: "stat"
-        gid: "mana"
-        value: 1
-    cost:
-      - type: "item"
-        gid: "simple_spellpage"
-        quantity: 1
-    results:
-      - type: "xp"
-        gid: "havencast"
-        base: 5
-      - type: "activity"
-        chance: 1
-        table:
-          - gid: "havencast_stinging_rays"
-            score: 0
-          - gid: "havencast_flame_whirl"
-            score: .50
-havencast_enchant_apprentice_wand:
-  name: "Cast Enchant Apprentice Wand"
-  description: "Cast the Enchant Apprentice Wand spell."
-  whatnot:
-    tags:
-      - "spell"
-      - "cantrip"
-    duration:
-      base: 70
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "havencast"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "havencast_speed"
-          scale_value: 1
-    requirements:
-      - type: "skill"
-        gid: "havencast"
-        level: 5
-      - type: "stat"
-        gid: "mana"
-        value: 1
-    cost:
-      - type: "item"
-        gid: "wood"
-        quantity: 1
-      - type: "item"
-        gid: "arcane_dust"
-        quantity: 10
-      - type: "item"
-        gid: "shimmering_essence"
-        quantity: 1
-    results:
-      - type: "item"
-        gid: "apprentice_wand"
-      - type: "xp"
-        gid: "havencast"
-        base: 8
-havencast_stinging_rays:
-  name: "Cast Stinging Rays"
-  description: "Cast the Stinging Rays spell."
-  innate: false
-  whatnot:
-    tags:
-      - "spell"
-    duration:
-      base: 70
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "havencast"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "havencast_speed"
-          scale_value: 1
-    requirements:
-      - type: "skill"
-        gid: "havencast"
-        level: 5
-      - type: "stat"
-        gid: "mana"
-        value: 1
-      - type: "equipment"
-        tag: "focus"
-    results:
-      - type: "condition"
-        gid: "stinging_rays"
-        duration: 600 # 10 minutes
-        message: "Beams of arcane energy appear in the air around you."
-      - type: "xp"
-        gid: "havencast"
-        base: 7
-havencast_flame_whirl:
-  name: "Cast Flame Whirl"
-  description: "Cast the Flame Whirl spell."
-  innate: false
-  whatnot:
-    tags:
-      - "spell"
-    duration:
-      base: 80
-      minimum: 35
-      scaling:
-        - type: "skill"
-          gid: "havencast"
-          scale_value: 0.5
-        - type: "stat"
-          gid: "havencast_speed"
-          scale_value: 1
-    requirements:
-      - type: "skill"
-        gid: "havencast"
-        level: 10
-      - type: "stat"
-        gid: "mana"
-        value: 2
-      - type: "equipment"
-        tag: "focus"
-    results:
-      - type: "condition"
-        gid: "flame_whirl"
-        duration: 600 # 10 minutes
-        message: "A thin disc of fire encircles you."
-      - type: "xp"
-        gid: "havencast"
-        base: 9
diff --git a/data/activities/havencast.yml b/data/activities/havencast.yml
new file mode 100644
index 0000000..ce84d24
--- /dev/null
+++ b/data/activities/havencast.yml
@@ -0,0 +1,211 @@
+havencast_light:
+  name: "Cast Light"
+  description: "Risk a little light."
+  whatnot:
+    tags:
+      - "spell"
+      - "cantrip"
+    requirements:
+      - type: "skill"
+        gid: "havencast"
+        level: 1
+      - type: "stat"
+        gid: "mana"
+        value: 1
+    duration:
+      base: 62
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "havencast"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "havencast_speed"
+          scale_value: 1
+    results:
+      - type: "condition"
+        gid: "light"
+        duration: 3600 # 1 Hour
+        message: "A ball of light glows before you."
+      - type: "xp"
+        gid: "havencast"
+        base: 2
+havencast_dazzle:
+  name: "Cast Dazzle"
+  description: "Cast the Dazzle cantrip."
+  whatnot:
+    tags:
+      - "spell"
+      - "cantrip"
+    duration:
+      base: 62
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "havencast"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "havencast_speed"
+          scale_value: 1
+    requirements:
+      - type: "skill"
+        gid: "havencast"
+        level: 2
+      - type: "stat"
+        gid: "mana"
+        value: 1
+    results:
+      - type: "condition"
+        gid: "dazzle"
+        duration: 600 # 10 minutes
+        message: "Sparkling lights distract your enemies."
+      - type: "xp"
+        gid: "havencast"
+        base: 3
+havencast_decipher_simple_magicscript:
+  name: "Cast Decipher Simple Magicscript"
+  description: "Cast the Decipher Simple Magicscript cantrip."
+  whatnot:
+    tags:
+      - "spell"
+      - "cantrip"
+    duration:
+      base: 64
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "havencast"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "havencast_speed"
+          scale_value: 1
+    requirements:
+      - type: "skill"
+        gid: "havencast"
+        level: 3
+      - type: "stat"
+        gid: "mana"
+        value: 1
+    cost:
+      - type: "item"
+        gid: "simple_spellpage"
+        quantity: 1
+    results:
+      - type: "xp"
+        gid: "havencast"
+        base: 5
+      - type: "activity"
+        chance: 1
+        table:
+          - gid: "havencast_stinging_rays"
+            score: 0
+          - gid: "havencast_flame_whirl"
+            score: .50
+havencast_enchant_apprentice_wand:
+  name: "Cast Enchant Apprentice Wand"
+  description: "Cast the Enchant Apprentice Wand spell."
+  whatnot:
+    tags:
+      - "spell"
+      - "cantrip"
+    duration:
+      base: 70
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "havencast"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "havencast_speed"
+          scale_value: 1
+    requirements:
+      - type: "skill"
+        gid: "havencast"
+        level: 5
+      - type: "stat"
+        gid: "mana"
+        value: 1
+    cost:
+      - type: "item"
+        gid: "wood"
+        quantity: 1
+      - type: "item"
+        gid: "arcane_dust"
+        quantity: 10
+      - type: "item"
+        gid: "shimmering_essence"
+        quantity: 1
+    results:
+      - type: "item"
+        gid: "apprentice_wand"
+      - type: "xp"
+        gid: "havencast"
+        base: 8
+havencast_stinging_rays:
+  name: "Cast Stinging Rays"
+  description: "Cast the Stinging Rays spell."
+  innate: false
+  whatnot:
+    tags:
+      - "spell"
+    duration:
+      base: 70
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "havencast"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "havencast_speed"
+          scale_value: 1
+    requirements:
+      - type: "skill"
+        gid: "havencast"
+        level: 5
+      - type: "stat"
+        gid: "mana"
+        value: 1
+      - type: "equipment"
+        tag: "focus"
+    results:
+      - type: "condition"
+        gid: "stinging_rays"
+        duration: 600 # 10 minutes
+        message: "Beams of arcane energy appear in the air around you."
+      - type: "xp"
+        gid: "havencast"
+        base: 7
+havencast_flame_whirl:
+  name: "Cast Flame Whirl"
+  description: "Cast the Flame Whirl spell."
+  innate: false
+  whatnot:
+    tags:
+      - "spell"
+    duration:
+      base: 80
+      minimum: 35
+      scaling:
+        - type: "skill"
+          gid: "havencast"
+          scale_value: 0.5
+        - type: "stat"
+          gid: "havencast_speed"
+          scale_value: 1
+    requirements:
+      - type: "skill"
+        gid: "havencast"
+        level: 10
+      - type: "stat"
+        gid: "mana"
+        value: 2
+      - type: "equipment"
+        tag: "focus"
+    results:
+      - type: "condition"
+        gid: "flame_whirl"
+        duration: 600 # 10 minutes
+        message: "A thin disc of fire encircles you."
+      - type: "xp"
+        gid: "havencast"
+        base: 9
diff --git a/data/items.yml b/data/items/general.yml
index cf475e5..cf475e5 100644
--- a/data/items.yml
+++ b/data/items/general.yml