Debug info

2 files changed, 25 insertions, 33 deletions

diff --git a/data/new-sample-grammars/drakensang/armor.gram b/data/new-sample-grammars/drakensang/armor.gram
index 090b69d..b36d93c 100644
--- a/data/new-sample-grammars/drakensang/armor.gram
+++ b/data/new-sample-grammars/drakensang/armor.gram
@@ -61,21 +61,16 @@ pragma initial-rule [ds-armor]
 	mitts
 	jerkin
 
-[ranger-armorprefix] [ranger-armorprefix-1]
-	[ranger-armormaterial]
-	[ranger-armorprefix-combo]
+[ranger-armorprefix] {empty}
+
+pragma prefix-with [ranger-armorprefix] [ranger-armormaterial] [ranger-armorprefix-1]
+pragma prefix-with [ranger-armorprefix] [ranger-armorprefix-prefix]
 
 [ranger-armorprefix-prefix] grim
 	fearsome
 	spirit
 	cave
 
-pragma prefix-with [ranger-armorprefix] [ranger-armorprefix-prefix]
-
-[ranger-armorprefix-combo] {empty} 
-
-pragma prefix-with [ranger-armorprefix-combo] [ranger-armormaterial] [ranger-armorprefix-1]
-
 [ranger-armorprefix-1] stalkers
 	hunters
 	wolf
@@ -112,11 +107,9 @@ pragma prefix-with [ranger-armorprefix-combo] [ranger-armormaterial] [ranger-arm
 	fist
 	mask
 
-[spellweaver-armorprefix] [spellweaver-armorprefix-1]
-	[spellweaver-armormaterial]
+[spellweaver-armorprefix] {empty}
 
-[spellweaver-armorprefix-combo] [spellweaver-armormaterial] [spellweaver-armorprefix-1]
-	[spellweaver-armorprefix-1] [spellweaver-armormaterial]
+pragma prefix-with [spellweaver-armorprefix] [spellweaver-armormaterial] [spellweaver-armorprefix-1]
 
 [spellweaver-armorprefix-1] apprentice
 	acolyte
diff --git a/data/new-sample-grammars/drakensang/gems.gram b/data/new-sample-grammars/drakensang/gems.gram
index 655bdcb..8ce0467 100644
--- a/data/new-sample-grammars/drakensang/gems.gram
+++ b/data/new-sample-grammars/drakensang/gems.gram
@@ -1,12 +1,13 @@
-[ds-gem] [gem-type]
-	[gem-type]
+[ds-gem] <^2> [gem-type]
 	[gem-type] of qaizah
 	[unique-gem]
 
+pragma prefix-with [ds-gem] [gem-adjective]
+pragma prefix-with [ds-gem] [gem-quality]
+
 pragma initial-rule [ds-gem]
 
-[gem-quality] [gem-quality-normal]
-	[gem-quality-normal]
+[gem-quality] <^2> [gem-quality-normal]
 	[gem-quality-alt]
 
 [gem-quality-normal] flawed
@@ -19,6 +20,7 @@ pragma initial-rule [ds-gem]
 	royal
 
 [gem-quality-alt] [gem-quality-alt-1]
+	[gem-quality-alt-2]
 
 [gem-quality-alt-1] lesser
 	cut
@@ -34,9 +36,6 @@ pragma initial-rule [ds-gem]
 	festive
 	solstice
 
-pragma prefix-with [ds-gem] [gem-adjective]
-pragma prefix-with [ds-gem] [gem-quality]
-
 [gem-type] ruby
 	onyx
 	sapphire
@@ -45,6 +44,9 @@ pragma prefix-with [ds-gem] [gem-quality]
 	amethyst
 	peridot
 
+pragma prefix-with [gem-type] [gem-descr]
+pragma suffix-with [gem-type] [gem-category]
+
 [gem-category] gem
 	jewel
 	star
@@ -59,24 +61,23 @@ pragma prefix-with [ds-gem] [gem-quality]
 	fortified
 	powerful
 
-pragma prefix-with [gem-type] [gem-descr]
-pragma suffix-with [gem-type] [gem-category]
-
-[unique-gem] [gem-category] of [unique-trail]
-	[unique-lead] [gem-category]
-	[unique-type]
-	[gem-category] of [unique-trail]
-	[unique-lead] [gem-category]
-	[unique-type]
+[unique-gem] [unique-type]
 	[gem-category]
 
-[unique-trail] insight
+pragma suffix-with [unique-gem] [unique-trail]
+pragma prefix-with [unique-gem] [unique-lead]
+
+[unique-trail] of [unique-trail-1]
+
+[unique-trail-1] insight
 	immunity
 	rage
 	acceleration
 	shadows
 	willpower
 
+pragma prefix-with [unique-trail-1] [gem-descr]
+
 [unique-lead] solstice
 	fluorite
 	shadow
@@ -86,6 +87,4 @@ pragma suffix-with [gem-type] [gem-category]
 [unique-type] bloodstone
 	moonstone
 
-pragma prefix-with [unique-type] [gem-descr]
-pragma prefix-with [unique-lead] [gem-descr]
-pragma prefix-with [unique-trail] [gem-descr]
+pragma prefix-with [unique-type] [gem-descr] [gem-descr]