Merge

70 files changed, 25 insertions, 0 deletions

diff --git a/RGens/data/sample-grammars/acronym.gram b/RGens/data/sample-grammars/acronym.gram
index 52d88ad..52d88ad 100644..100755
--- a/RGens/data/sample-grammars/acronym.gram
+++ b/RGens/data/sample-grammars/acronym.gram
diff --git a/RGens/data/sample-grammars/address.gram b/RGens/data/sample-grammars/address.gram
index d2d5eef..d2d5eef 100644..100755
--- a/RGens/data/sample-grammars/address.gram
+++ b/RGens/data/sample-grammars/address.gram
diff --git a/RGens/data/sample-grammars/buzzword.gram b/RGens/data/sample-grammars/buzzword.gram
index d25331f..d25331f 100644..100755
--- a/RGens/data/sample-grammars/buzzword.gram
+++ b/RGens/data/sample-grammars/buzzword.gram
diff --git a/RGens/data/sample-grammars/career.gram b/RGens/data/sample-grammars/career.gram
index 63142f5..63142f5 100644..100755
--- a/RGens/data/sample-grammars/career.gram
+++ b/RGens/data/sample-grammars/career.gram
diff --git a/RGens/data/sample-grammars/city.gram b/RGens/data/sample-grammars/city.gram
index b344d3b..b344d3b 100644..100755
--- a/RGens/data/sample-grammars/city.gram
+++ b/RGens/data/sample-grammars/city.gram
diff --git a/RGens/data/sample-grammars/college.gram b/RGens/data/sample-grammars/college.gram
index 33b45e3..33b45e3 100644..100755
--- a/RGens/data/sample-grammars/college.gram
+++ b/RGens/data/sample-grammars/college.gram
diff --git a/RGens/data/sample-grammars/company.gram b/RGens/data/sample-grammars/company.gram
index 40ea83b..40ea83b 100644..100755
--- a/RGens/data/sample-grammars/company.gram
+++ b/RGens/data/sample-grammars/company.gram
diff --git a/RGens/data/sample-grammars/computer.gram b/RGens/data/sample-grammars/computer.gram
index a3a7814..a3a7814 100644..100755
--- a/RGens/data/sample-grammars/computer.gram
+++ b/RGens/data/sample-grammars/computer.gram
diff --git a/RGens/data/sample-grammars/congress.gram b/RGens/data/sample-grammars/congress.gram
index cffe469..cffe469 100644..100755
--- a/RGens/data/sample-grammars/congress.gram
+++ b/RGens/data/sample-grammars/congress.gram
diff --git a/RGens/data/sample-grammars/dates.gram b/RGens/data/sample-grammars/dates.gram
index 1ed0daa..1ed0daa 100644..100755
--- a/RGens/data/sample-grammars/dates.gram
+++ b/RGens/data/sample-grammars/dates.gram
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloii.gram b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
index 411e795..238330d 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloii.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
@@ -44,6 +44,7 @@ pragma prefix-with [money-type] [metal-type]
 	gold
 	platinum
 
+<<<<<<< HEAD
 [item] [item-types]
 	[item-types]
 	[item-types]
@@ -61,3 +62,11 @@ pragma prefix-with [money-type] [metal-type]
 [ds-items] [ds-gem]
 	[ds-rune]
 	[ds-armor]
+=======
+[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]
+>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
index 5fa174b..6997521 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
@@ -16,7 +16,17 @@
 	[gems]
 	[inscriptions]
 	[perishables]
+	[ds-items]
+	[ds-items]
+	[ds-items]
 
+<<<<<<< HEAD
+=======
+[ds-items] [ds-gem]
+	[ds-rune]
+	[ds-armor]
+
+>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1
 pragma export-rule [d2-item-type]
 
 [armor] [light-armor]
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
index af6c9ec..f090292 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
@@ -20,9 +20,12 @@ pragma export-rule [perishables]
 	skull
 	blood
 	ribcage
+<<<<<<< HEAD
 	viscera
 	flesh
 	claw
+=======
+>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1
 
 [perishable-type] potion
 	oil
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
index 5157115..c8ffd83 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
@@ -4,12 +4,15 @@
 
 pragma export-rule [d2-prefix]
 
+<<<<<<< HEAD
 [d2-prefix-chain] [d2-prefix-part] [d2-prefix-part]
 	[d2-prefix-part] [d2-prefix-part]
 	[d2-prefix-part] and [d2-prefix-part]
 	[d2-prefix-part] and [d2-prefix-part]
 	[d2-prefix-part] [d2-prefix-part] [d2-prefix-part]
 
+=======
+>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1
 [d2-prefix-part] [armor-class]
 	[saving-throw]
 	[foe-reaction]
diff --git a/RGens/data/sample-grammars/dungeondressing/abandoned.gram b/RGens/data/sample-grammars/dungeondressing/abandoned.gram
index c9ed653..c9ed653 100644..100755
--- a/RGens/data/sample-grammars/dungeondressing/abandoned.gram
+++ b/RGens/data/sample-grammars/dungeondressing/abandoned.gram
diff --git a/RGens/data/sample-grammars/dungeondressing/bedroom.gram b/RGens/data/sample-grammars/dungeondressing/bedroom.gram
index 8bb9449..8bb9449 100644..100755
--- a/RGens/data/sample-grammars/dungeondressing/bedroom.gram
+++ b/RGens/data/sample-grammars/dungeondressing/bedroom.gram
diff --git a/RGens/data/sample-grammars/dungeondressing/dragonencounter.gram b/RGens/data/sample-grammars/dungeondressing/dragonencounter.gram
index 5c299c3..5c299c3 100644..100755
--- a/RGens/data/sample-grammars/dungeondressing/dragonencounter.gram
+++ b/RGens/data/sample-grammars/dungeondressing/dragonencounter.gram
diff --git a/RGens/data/sample-grammars/dungeondressing/kitchen.gram b/RGens/data/sample-grammars/dungeondressing/kitchen.gram
index 23abda4..23abda4 100644..100755
--- a/RGens/data/sample-grammars/dungeondressing/kitchen.gram
+++ b/RGens/data/sample-grammars/dungeondressing/kitchen.gram
diff --git a/RGens/data/sample-grammars/dungeondressing/monster.gram b/RGens/data/sample-grammars/dungeondressing/monster.gram
index 47e1417..47e1417 100644..100755
--- a/RGens/data/sample-grammars/dungeondressing/monster.gram
+++ b/RGens/data/sample-grammars/dungeondressing/monster.gram
diff --git a/RGens/data/sample-grammars/elementals.gram b/RGens/data/sample-grammars/elementals.gram
index 30d256f..30d256f 100644..100755
--- a/RGens/data/sample-grammars/elementals.gram
+++ b/RGens/data/sample-grammars/elementals.gram
diff --git a/RGens/data/sample-grammars/fortune.gram b/RGens/data/sample-grammars/fortune.gram
index 8bfce32..8bfce32 100644..100755
--- a/RGens/data/sample-grammars/fortune.gram
+++ b/RGens/data/sample-grammars/fortune.gram
diff --git a/RGens/data/sample-grammars/horror.gram b/RGens/data/sample-grammars/horror.gram
index 07d84de..07d84de 100644..100755
--- a/RGens/data/sample-grammars/horror.gram
+++ b/RGens/data/sample-grammars/horror.gram
diff --git a/RGens/data/sample-grammars/insults.gram b/RGens/data/sample-grammars/insults.gram
index 98a7a8e..98a7a8e 100644..100755
--- a/RGens/data/sample-grammars/insults.gram
+++ b/RGens/data/sample-grammars/insults.gram
diff --git a/RGens/data/sample-grammars/linux.gram b/RGens/data/sample-grammars/linux.gram
index ad18d65..ad18d65 100644..100755
--- a/RGens/data/sample-grammars/linux.gram
+++ b/RGens/data/sample-grammars/linux.gram
diff --git a/RGens/data/sample-grammars/long-data/animal.gram b/RGens/data/sample-grammars/long-data/animal.gram
index 8ce3b9d..8ce3b9d 100644..100755
--- a/RGens/data/sample-grammars/long-data/animal.gram
+++ b/RGens/data/sample-grammars/long-data/animal.gram
diff --git a/RGens/data/sample-grammars/long-data/canada-province.gram b/RGens/data/sample-grammars/long-data/canada-province.gram
index 8210d42..8210d42 100644..100755
--- a/RGens/data/sample-grammars/long-data/canada-province.gram
+++ b/RGens/data/sample-grammars/long-data/canada-province.gram
diff --git a/RGens/data/sample-grammars/long-data/cards.gram b/RGens/data/sample-grammars/long-data/cards.gram
index 51a86d4..51a86d4 100644..100755
--- a/RGens/data/sample-grammars/long-data/cards.gram
+++ b/RGens/data/sample-grammars/long-data/cards.gram
diff --git a/RGens/data/sample-grammars/long-data/color.gram b/RGens/data/sample-grammars/long-data/color.gram
index c71d04d..c71d04d 100644..100755
--- a/RGens/data/sample-grammars/long-data/color.gram
+++ b/RGens/data/sample-grammars/long-data/color.gram
diff --git a/RGens/data/sample-grammars/long-data/first-name-female.gram b/RGens/data/sample-grammars/long-data/first-name-female.gram
index 0bdfc8b..0bdfc8b 100644..100755
--- a/RGens/data/sample-grammars/long-data/first-name-female.gram
+++ b/RGens/data/sample-grammars/long-data/first-name-female.gram
diff --git a/RGens/data/sample-grammars/long-data/first-name-male.gram b/RGens/data/sample-grammars/long-data/first-name-male.gram
index 5642f9a..5642f9a 100644..100755
--- a/RGens/data/sample-grammars/long-data/first-name-male.gram
+++ b/RGens/data/sample-grammars/long-data/first-name-male.gram
diff --git a/RGens/data/sample-grammars/long-data/geographic-thing.gram b/RGens/data/sample-grammars/long-data/geographic-thing.gram
index 178bd7f..178bd7f 100644..100755
--- a/RGens/data/sample-grammars/long-data/geographic-thing.gram
+++ b/RGens/data/sample-grammars/long-data/geographic-thing.gram
diff --git a/RGens/data/sample-grammars/long-data/last-name.gram b/RGens/data/sample-grammars/long-data/last-name.gram
index b99a40c..b99a40c 100644..100755
--- a/RGens/data/sample-grammars/long-data/last-name.gram
+++ b/RGens/data/sample-grammars/long-data/last-name.gram
diff --git a/RGens/data/sample-grammars/long-data/letters.gram b/RGens/data/sample-grammars/long-data/letters.gram
index f561b99..f561b99 100644..100755
--- a/RGens/data/sample-grammars/long-data/letters.gram
+++ b/RGens/data/sample-grammars/long-data/letters.gram
diff --git a/RGens/data/sample-grammars/long-data/nation.gram b/RGens/data/sample-grammars/long-data/nation.gram
index d15788d..d15788d 100644..100755
--- a/RGens/data/sample-grammars/long-data/nation.gram
+++ b/RGens/data/sample-grammars/long-data/nation.gram
diff --git a/RGens/data/sample-grammars/long-data/numbers.gram b/RGens/data/sample-grammars/long-data/numbers.gram
index 8525102..8525102 100644..100755
--- a/RGens/data/sample-grammars/long-data/numbers.gram
+++ b/RGens/data/sample-grammars/long-data/numbers.gram
diff --git a/RGens/data/sample-grammars/long-data/planet.gram b/RGens/data/sample-grammars/long-data/planet.gram
index 1da1678..1da1678 100644..100755
--- a/RGens/data/sample-grammars/long-data/planet.gram
+++ b/RGens/data/sample-grammars/long-data/planet.gram
diff --git a/RGens/data/sample-grammars/long-data/real-city.gram b/RGens/data/sample-grammars/long-data/real-city.gram
index 7ca57b9..7ca57b9 100644..100755
--- a/RGens/data/sample-grammars/long-data/real-city.gram
+++ b/RGens/data/sample-grammars/long-data/real-city.gram
diff --git a/RGens/data/sample-grammars/long-data/real-company.gram b/RGens/data/sample-grammars/long-data/real-company.gram
index f81ec14..f81ec14 100644..100755
--- a/RGens/data/sample-grammars/long-data/real-company.gram
+++ b/RGens/data/sample-grammars/long-data/real-company.gram
diff --git a/RGens/data/sample-grammars/long-data/relative.gram b/RGens/data/sample-grammars/long-data/relative.gram
index a18e015..a18e015 100644..100755
--- a/RGens/data/sample-grammars/long-data/relative.gram
+++ b/RGens/data/sample-grammars/long-data/relative.gram
diff --git a/RGens/data/sample-grammars/long-data/roman-numeral.gram b/RGens/data/sample-grammars/long-data/roman-numeral.gram
index 886d44c..886d44c 100644..100755
--- a/RGens/data/sample-grammars/long-data/roman-numeral.gram
+++ b/RGens/data/sample-grammars/long-data/roman-numeral.gram
diff --git a/RGens/data/sample-grammars/long-data/syllables.gram b/RGens/data/sample-grammars/long-data/syllables.gram
index 925c2aa..925c2aa 100644..100755
--- a/RGens/data/sample-grammars/long-data/syllables.gram
+++ b/RGens/data/sample-grammars/long-data/syllables.gram
diff --git a/RGens/data/sample-grammars/long-data/town-name.gram b/RGens/data/sample-grammars/long-data/town-name.gram
index e176c7d..e176c7d 100644..100755
--- a/RGens/data/sample-grammars/long-data/town-name.gram
+++ b/RGens/data/sample-grammars/long-data/town-name.gram
diff --git a/RGens/data/sample-grammars/long-data/tree.gram b/RGens/data/sample-grammars/long-data/tree.gram
index 6fd0f0e..6fd0f0e 100644..100755
--- a/RGens/data/sample-grammars/long-data/tree.gram
+++ b/RGens/data/sample-grammars/long-data/tree.gram
diff --git a/RGens/data/sample-grammars/media.gram b/RGens/data/sample-grammars/media.gram
index f3a1c98..f3a1c98 100644..100755
--- a/RGens/data/sample-grammars/media.gram
+++ b/RGens/data/sample-grammars/media.gram
diff --git a/RGens/data/sample-grammars/mission.gram b/RGens/data/sample-grammars/mission.gram
index e474fcd..e474fcd 100644..100755
--- a/RGens/data/sample-grammars/mission.gram
+++ b/RGens/data/sample-grammars/mission.gram
diff --git a/RGens/data/sample-grammars/names.gram b/RGens/data/sample-grammars/names.gram
index 104c136..104c136 100644..100755
--- a/RGens/data/sample-grammars/names.gram
+++ b/RGens/data/sample-grammars/names.gram
diff --git a/RGens/data/sample-grammars/newspaper.gram b/RGens/data/sample-grammars/newspaper.gram
index afa91ee..afa91ee 100644..100755
--- a/RGens/data/sample-grammars/newspaper.gram
+++ b/RGens/data/sample-grammars/newspaper.gram
diff --git a/RGens/data/sample-grammars/numbers.gram b/RGens/data/sample-grammars/numbers.gram
index 4db84b9..4db84b9 100644..100755
--- a/RGens/data/sample-grammars/numbers.gram
+++ b/RGens/data/sample-grammars/numbers.gram
diff --git a/RGens/data/sample-grammars/ordinal.gram b/RGens/data/sample-grammars/ordinal.gram
index da4aa4e..da4aa4e 100644..100755
--- a/RGens/data/sample-grammars/ordinal.gram
+++ b/RGens/data/sample-grammars/ordinal.gram
diff --git a/RGens/data/sample-grammars/organization.gram b/RGens/data/sample-grammars/organization.gram
index 9c88686..9c88686 100644..100755
--- a/RGens/data/sample-grammars/organization.gram
+++ b/RGens/data/sample-grammars/organization.gram
diff --git a/RGens/data/sample-grammars/phone-number.gram b/RGens/data/sample-grammars/phone-number.gram
index 163ef4a..163ef4a 100644..100755
--- a/RGens/data/sample-grammars/phone-number.gram
+++ b/RGens/data/sample-grammars/phone-number.gram
diff --git a/RGens/data/sample-grammars/president.gram b/RGens/data/sample-grammars/president.gram
index 63b928c..63b928c 100644..100755
--- a/RGens/data/sample-grammars/president.gram
+++ b/RGens/data/sample-grammars/president.gram
diff --git a/RGens/data/sample-grammars/rtwiki/adjective.gram b/RGens/data/sample-grammars/rtwiki/adjective.gram
index 09168aa..09168aa 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/adjective.gram
+++ b/RGens/data/sample-grammars/rtwiki/adjective.gram
diff --git a/RGens/data/sample-grammars/rtwiki/bodyparts.gram b/RGens/data/sample-grammars/rtwiki/bodyparts.gram
index 71b4924..71b4924 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/bodyparts.gram
+++ b/RGens/data/sample-grammars/rtwiki/bodyparts.gram
diff --git a/RGens/data/sample-grammars/rtwiki/class.gram b/RGens/data/sample-grammars/rtwiki/class.gram
index 8fcb17c..8fcb17c 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/class.gram
+++ b/RGens/data/sample-grammars/rtwiki/class.gram
diff --git a/RGens/data/sample-grammars/rtwiki/color.gram b/RGens/data/sample-grammars/rtwiki/color.gram
index 346f73b..346f73b 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/color.gram
+++ b/RGens/data/sample-grammars/rtwiki/color.gram
diff --git a/RGens/data/sample-grammars/rtwiki/creature.gram b/RGens/data/sample-grammars/rtwiki/creature.gram
index b3f7b92..b3f7b92 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/creature.gram
+++ b/RGens/data/sample-grammars/rtwiki/creature.gram
diff --git a/RGens/data/sample-grammars/rtwiki/death-cause.gram b/RGens/data/sample-grammars/rtwiki/death-cause.gram
index 74e58e8..74e58e8 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/death-cause.gram
+++ b/RGens/data/sample-grammars/rtwiki/death-cause.gram
diff --git a/RGens/data/sample-grammars/rtwiki/fantasy-name.gram b/RGens/data/sample-grammars/rtwiki/fantasy-name.gram
index c4ce02e..c4ce02e 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/fantasy-name.gram
+++ b/RGens/data/sample-grammars/rtwiki/fantasy-name.gram
diff --git a/RGens/data/sample-grammars/rtwiki/favorite.gram b/RGens/data/sample-grammars/rtwiki/favorite.gram
index ba1468a..ba1468a 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/favorite.gram
+++ b/RGens/data/sample-grammars/rtwiki/favorite.gram
diff --git a/RGens/data/sample-grammars/rtwiki/guns.gram b/RGens/data/sample-grammars/rtwiki/guns.gram
index 269aa0d..269aa0d 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/guns.gram
+++ b/RGens/data/sample-grammars/rtwiki/guns.gram
diff --git a/RGens/data/sample-grammars/rtwiki/item.gram b/RGens/data/sample-grammars/rtwiki/item.gram
index 601710a..601710a 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/item.gram
+++ b/RGens/data/sample-grammars/rtwiki/item.gram
diff --git a/RGens/data/sample-grammars/rtwiki/traits.gram b/RGens/data/sample-grammars/rtwiki/traits.gram
index c3ff790..c3ff790 100644..100755
--- a/RGens/data/sample-grammars/rtwiki/traits.gram
+++ b/RGens/data/sample-grammars/rtwiki/traits.gram
diff --git a/RGens/data/sample-grammars/school.gram b/RGens/data/sample-grammars/school.gram
index cd9298b..cd9298b 100644..100755
--- a/RGens/data/sample-grammars/school.gram
+++ b/RGens/data/sample-grammars/school.gram
diff --git a/RGens/data/sample-grammars/slashdot.gram b/RGens/data/sample-grammars/slashdot.gram
index 2b38ee3..2b38ee3 100644..100755
--- a/RGens/data/sample-grammars/slashdot.gram
+++ b/RGens/data/sample-grammars/slashdot.gram
diff --git a/RGens/data/sample-grammars/states.gram b/RGens/data/sample-grammars/states.gram
index 43f1402..43f1402 100644..100755
--- a/RGens/data/sample-grammars/states.gram
+++ b/RGens/data/sample-grammars/states.gram
diff --git a/RGens/data/sample-grammars/theory.gram b/RGens/data/sample-grammars/theory.gram
index af2ce49..af2ce49 100644..100755
--- a/RGens/data/sample-grammars/theory.gram
+++ b/RGens/data/sample-grammars/theory.gram
diff --git a/RGens/data/sample-grammars/trademark.gram b/RGens/data/sample-grammars/trademark.gram
index 7ec2fef..7ec2fef 100644..100755
--- a/RGens/data/sample-grammars/trademark.gram
+++ b/RGens/data/sample-grammars/trademark.gram
diff --git a/RGens/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram b/RGens/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram
index e0a21d3..e0a21d3 100644..100755
--- a/RGens/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram
+++ b/RGens/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram
diff --git a/RGens/data/sample-grammars/web.gram b/RGens/data/sample-grammars/web.gram
index 357fc36..357fc36 100644..100755
--- a/RGens/data/sample-grammars/web.gram
+++ b/RGens/data/sample-grammars/web.gram