Update

4 files changed, 67 insertions, 30 deletions

diff --git a/RGens/data/sample-grammars/diablo-ii/diabloii.gram b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
index f921c0a..2f3041a 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloii.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
@@ -1,8 +1,8 @@
 [base-treasures] [base-treasure]
-	         [quote-treasure] as well as [quote-treasure]
-	         [quote-treasure] or [quote-treasure]
-	         [quote-treasure] , and [quote-treasure] as well as [quote-treasure]
-	         [quote-treasure] , [quote-treasure] or [quote-treasure]
+	[quote-treasure] as well as [quote-treasure]
+	[quote-treasure] or [quote-treasure]
+	[quote-treasure] , and [quote-treasure] as well as [quote-treasure]
+	[quote-treasure] , [quote-treasure] or [quote-treasure]
 
 pragma initial-rule [base-treasures]
 
@@ -11,38 +11,42 @@ pragma initial-rule [base-treasures]
 pragma despace-rule [quote-treasure]
 
 [base-treasure] a [item]
+	a [item]
+	a [item]
 	[non-item]
 
 [non-item] [money]
-	   [money]
-	   nothing
+	[money]
+	[money]
+	[money]
+	nothing
 
 [money] [diablo-amount] [money-type]
 
 [diablo-amount] 1
-	        5
-	        10
-	        20
-	        50
-	        100
-	        200
-	        500
-	        1000
+	5
+	10
+	20
+	50
+	100
+	200
+	500
+	1000
 
 pragma export-rule [diablo-amount]
 
-[money-type] coin
+[money-type] coins
 
 pragma prefix-with [money-type] [metal-type]
 
 [metal-type] copper
-	     silver
-	     gold
-	     platinum
+	silver
+	gold
+	platinum
 
-[item]  [item-act]
-	[item-act] of [suffix]
-	[item-act] of [suffix] and [suffix]
+[item] [d2-item-type]
+	[d2-item-type] of [suffix]
+	[d2-item-type] of [suffix] and [suffix]
 
 pragma prefix-with [item] [prefix]
 pragma prefix-with [item] [prefix]
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
index b407558..8450b97 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
@@ -1,4 +1,4 @@
-[item-act] [armor]
+[d2-item-type] [armor]
 	[headgear]
 	[accoutrements]
 	[shields]
@@ -16,8 +16,15 @@
 	[gems]
 	[inscriptions]
 	[perishables]
+	[ds-items]
+	[ds-items]
+	[ds-items]
 
-pragma export-rule [item-act]
+[ds-items] [ds-gem]
+	[ds-rune]
+	[ds-armor]
+
+pragma export-rule [d2-item-type]
 
 [armor] [light-armor]
 	[medium-armor]
@@ -144,6 +151,7 @@ pragma prefix-with [clubs] [club-prefix]
 	halberd
 
 [axes] axe
+	hatchet
 
 pragma prefix-with [axes] [axe-type]
 pragma prefix-with [axes] [axe-size]
@@ -199,6 +207,7 @@ pragma prefix-with [act-crossbow] [crossbow-weight]
 
 [crossbow-weight] light
 	heavy
+	hand
 
 [wands] wand
 	torch
@@ -207,11 +216,12 @@ pragma prefix-with [act-crossbow] [crossbow-weight]
 pragma prefix-with [wands] [wand-type]
 
 [wand-type] bone
-	yew
+	[tree]
 
 [staves] staff
 
 pragma prefix-with [staves] [staff-type]
+pragma prefix-with [staves] [tree]
 pragma prefix-with [staves] [staff-length]
 
 [staff-type] gnarled
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
index c13cce8..b70919a 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
@@ -16,16 +16,33 @@ pragma export-rule [perishables]
 	scalp
 	spleen
 	soul
+	bone
+	skull
+	blood
+	ribcage
 
 [perishable-type] potion
 	oil
 	herb
 	elixir
 	resin
+	flask
+	spice
+	salve
 
-[perishable-effect] [restore-effect]
-	light [restore-effect]
-	full [restore-effect]
+pragma prefix-with [perishable-type] [bodypart]
+
+[perishable-degree] light
+	medium
+	full
+
+[perishable-effect] [perishable-effect-1]
+	[perishable-effect-1]
+	[perishable-effect-1]
+	[perishable-effect-1]
+	[perishable-degree] [perishable-effect-1]
+
+[perishable-effect-1] [restore-effect]
 	detox
 	restoration
 	flaming
@@ -97,8 +114,10 @@ pragma export-rule [perishables]
 	skill
 	fortitude
 	blacksmith’s
+	blacksmithing
 	permanence
 	enchantment
+	enchanting
 
 [restore-effect] healing
 	mana
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
index a13d05a..2087352 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
@@ -1,4 +1,10 @@
-[prefix] [armor-class]
+[d2-prefix] [d2-prefix-part]
+	[d2-prefix-part]
+	[d2-prefix-chain]
+
+pragma export-rule [d2-prefix]
+
+[d2-prefix-part] [armor-class]
 	[saving-throw]
 	[foe-reaction]
 	[skill-improve]
@@ -12,8 +18,6 @@
 	[to-hit-damage]
 	[item-charges]
 
-pragma export-rule [prefix]
-
 [armor-class] sturdy
 	fine
 	strong