Expand on random tables

1 files changed, 104 insertions, 5 deletions

diff --git a/src/data/random_tables/ua_magic_items.yaml b/src/data/random_tables/ua_magic_items.yaml
index 1ec9468..50909ef 100644
--- a/src/data/random_tables/ua_magic_items.yaml
+++ b/src/data/random_tables/ua_magic_items.yaml
@@ -4,25 +4,35 @@ ua_magic_items:
     - roll: 1-20
       steps:
         - text: "Potion"
-          table: ua_potions
+        - table: ua_potions
     - roll: 21-35
       steps:
         - text: "Scroll"
+        - table: ua_scrolls
     - roll: 36-40
       steps:
         - text: "Ring"
+        - table: ua_rings
+    - roll: 41-45
+      steps:
+        - text: "Rod/Staff/Wand"
+        - table: ua_rod_staff_wand
     - roll: 46-60
       steps:
-        - text: "Miscellaneous Magic"
+        - text: "Misc. Magic"
+        - table: ua_misc_magic
     - roll: 61-75
       steps:
-        - text: "Armor & Shields"
+        - text: "Armor/Shield"
+        - table: ua_armor_shields
     - roll: 76-86
       steps:
-        - text: "Swords"
+        - text: "Sword"
+        - table: ua_swords
     - roll: 87-100
       steps:
-        - text: "Miscellaneous Weapons"
+        - text: "Misc. Weapon"
+        - table: ua_misc_weapons
 
 ua_potions:
   formula: d100
@@ -33,3 +43,92 @@ ua_potions:
     - roll: 66-100
       steps:
         - text: "Table 2"
+
+ua_scrolls:
+  formula: d100
+  rows:
+    - roll: 1-85
+      steps:
+        - text: "Table 1"
+    - roll: 86-100
+      steps:
+        - text: "Table 2"
+
+ua_rings:
+  formula: d100
+  rows:
+    - roll: 1-67
+      steps:
+        - text: "Table 1"
+    - roll: 68-100
+      steps:
+        - text: "Table 2"
+
+ua_rod_staff_wand:
+  formula: d100
+  rows:
+    - roll: 1-40
+      steps:
+        - text: "Table 1"
+    - roll: 41-100
+      steps:
+        - text: "Table 2"
+
+ua_misc_magic:
+  formula: d100
+  rows:
+    - roll: 1-14
+      steps:
+        - text: "Table 1"
+    - roll: 15-28
+      steps:
+        - text: "Table 2"
+    - roll: 29-42
+      steps:
+        - text: "Table 3"
+    - roll: 43-56
+      steps:
+        - text: "Table 4"
+    - roll: 57-70
+      steps:
+        - text: "Table 5"
+    - roll: 71-85
+      steps:
+        - text: "Table 6"
+    - roll: 86-100
+      steps:
+        - text: "Table 7"
+
+ua_armor_shields:
+  formula: d100
+  rows:
+    - roll: 1-50
+      steps:
+        - text: "Table 1"
+    - roll: 51-100
+      steps:
+        - text: "Table 2"
+
+ua_swords:
+  formula: d100
+  rows:
+    - roll: 1-95
+      steps:
+        - text: "Table 1"
+        - table: sword_intelligence
+        - table: sword_type
+    - roll: 96-100
+      steps:
+        - text: "Table 2"
+        - table: sword_intelligence
+        - table: sword_type
+
+ua_misc_weapons:
+  formula: d100
+  rows:
+    - roll: 1-50
+      steps:
+        - text: "Table 1"
+    - roll: 51-100
+      steps:
+        - text: "Table 2"