Update

12 files changed, 171 insertions, 132 deletions

diff --git a/RGens/data/new-sample-grammars/repinsult.gram b/RGens/data/new-sample-grammars/repinsult.gram
index ab63fb9..30ac89d 100644
--- a/RGens/data/new-sample-grammars/repinsult.gram
+++ b/RGens/data/new-sample-grammars/repinsult.gram
@@ -1,6 +1,11 @@
-[rep-insult] [brag-verb] [rude-phrase] [rude-scapegoat]
+[rep-insult] [rude-scapegoat]
 
-[brag-verb] → abolish
+pragma prefix-with [rep-insult] [rude-phrase]
+pragma prefix-with [rep-insult] [brag-verb]
+
+pragma initial-rule [rep-insult]
+
+[brag-verb] abolish
 	ban
 	bash
 	beat
@@ -23,7 +28,7 @@
 	steam-roller
 	wipe
 
-[rude-adj] → AIDS-infested
+[rude-phrase] AIDS-infested
 	America-hating
 	Arab
 	ass-pounding
@@ -85,7 +90,7 @@
 	whining
 	wimpoid
 
-[rude-noun] → alien
+[rude-scapegoat] alien
 	America-hater
 	animal
 	Arab
diff --git a/RGens/data/sample-grammars/24hr-rpg.gram b/RGens/data/sample-grammars/24hr-rpg.gram
index 1ac7c71..dcfc21d 100755
--- a/RGens/data/sample-grammars/24hr-rpg.gram
+++ b/RGens/data/sample-grammars/24hr-rpg.gram
@@ -5,7 +5,15 @@
 	     [rpg-part] : [rpg-part] the [rpg-part]
 	     [rpg-part] : [rpg-part] [rpg-part]
 
+[rpg-name-phrase] [quote-rpg-name] was just released
+	[quote-rpg-name] vs [quote-rpg-name] : which is better?
+	[quote-rpg-name] : will it live up to the hype?
+	[quote-rpg-name] released its [ordinal] edition today
+
+[quote-rpg-name] ( [rpg-name] )
+
 pragma initial-rule [rpg-name]
+pragma export-rule [rpg-name-phrase]
 
 [rpg-part] → tits
 	     teeth
diff --git a/RGens/data/sample-grammars/acronym.gram b/RGens/data/sample-grammars/acronym.gram
index 6d260f4..52d88ad 100644
--- a/RGens/data/sample-grammars/acronym.gram
+++ b/RGens/data/sample-grammars/acronym.gram
@@ -1,9 +1,25 @@
-[acronym] [actual+acronym]
+[acronym] [acronym-part]
+	[acronym-part]
+	[acronym-part]
+	[acronym-part]
+	[acronym-phrase]
 
 pragma initial-rule [acronym]
 
-[actual+acronym] [consonant] [vowel] [consonant]
+pragma despace-rule [acronym]
+
+[acronym-phrase] [acronym-part] / [acronym-part]
+	[acronym-part] - [acronym-part]
+
+[acronym-part] [join-acronym]
+	[dot-acronym]
+
+[join-acronym] [consonant] [vowel] [consonant]
 	[consonant-group] [consonant] [consonant]
 	[consonant] [consonant] [consonant] [consonant]
 	[consonant] [vowel] [consonant] [vowel]
 	[letter] [vowel-group] [letter] [consonant]
+
+[dot-acronym] [consonant] . [vowel] . [consonant]
+	[consonant] . [consonant] . [consonant] . [consonant]
+	[consonant] . [vowel] . [consonant] . [vowel]
diff --git a/RGens/data/sample-grammars/address.gram b/RGens/data/sample-grammars/address.gram
index de798ee..d2d5eef 100644
--- a/RGens/data/sample-grammars/address.gram
+++ b/RGens/data/sample-grammars/address.gram
@@ -1,25 +1,40 @@
-[us-postal-address] [us-postal-address1]
-	[us-postal-address1]
-	[us-postal-address1]
-	[us-postal-address1]
-	[company]
+[us-postal-address] [street-address]
 
 pragma initial-rule [us-postal-address]
 
-[com-street-address] , [street-address]
+[address-prefix] [address-prefix-body] ,
 
-[city-post-zip] , [city] , [us-postalstate] [zipcode]
+[address-prefix-suffix] mail at
+	contact at
+	visit us at
+	located at
 
-pragma suffix-with [us-postal-address] [com-street-address]
-pragma suffix-with [us-postal-address] [city-post-zip]
+pragma suffix-with [address-prefix] [address-prefix-suffix]
 
-[us-postal-address1] [full-name]
+[address-prefix-prefix] [full-name]
 	[full-name-and-title]
 	[person]
 
+[address-prefix-body] [address-prefix-prefix]
+	[address-prefix-prefix]
+	[company]
+
+[city-post-zip] , [city] , [us-postalstate] [zipcode]
+
+pragma prefix-with [us-postal-address] [address-prefix]
+pragma suffix-with [us-postal-address] [city-post-zip]
+
 [com-company] , [company]
+	, [work-type] [company]
+
+[work-type] works for
+	works at
+	works with
+	contractor for
+	president of
+	interning at
 
-pragma suffix-with [us-postal-address1] [com-company]
+pragma suffix-with [address-prefix-prefix] [com-company]
 
 [street-address] [medium-number] [street]
 	p.o. box [medium-number]
@@ -56,6 +71,7 @@ pragma suffix-with [street] [street-suffix]
 	s.
 	e.
 	w.
+	[cardinal]
 
 [street-suffix] street
 	st.
diff --git a/RGens/data/sample-grammars/anime.gram b/RGens/data/sample-grammars/anime.gram
index eabbade..85cc7db 100755
--- a/RGens/data/sample-grammars/anime.gram
+++ b/RGens/data/sample-grammars/anime.gram
@@ -1,16 +1,22 @@
-[anime-name] [first-name]
+[anime-name] [short-anime-name]
+	[short-anime-name]
+	[long-anime-name]
+
+[short-anime-name] [first-name]
 	[second-name]
 	[third-name]
 
+[long-anime-name] [short-anime-name]
+
 pragma initial-rule [anime-name]
 
-pragma suffix-with [anime-name] [first-name]
-pragma suffix-with [anime-name] [second-name]
-pragma suffix-with [anime-name] [third-name]
+pragma suffix-with [short-anime-name] [first-name]
+pragma suffix-with [short-anime-name] [second-name]
+pragma suffix-with [short-anime-name] [third-name]
 
-pragma prefix-with [anime-name] [third-name]
-pragma prefix-with [anime-name] [second-name]
-pragma prefix-with [anime-name] [first-name]
+pragma prefix-with [long-anime-name] [third-name]
+pragma prefix-with [long-anime-name] [second-name]
+pragma prefix-with [long-anime-name] [first-name]
 
 [first-name] Vampire
 	Cat
diff --git a/RGens/data/sample-grammars/art-objects.gram b/RGens/data/sample-grammars/art-objects.gram
index 1338470..c824958 100755
--- a/RGens/data/sample-grammars/art-objects.gram
+++ b/RGens/data/sample-grammars/art-objects.gram
@@ -15,13 +15,19 @@ pragma initial-rule [art-treasure-group]
 
 pragma despace-rule [quote-treasure]
 
-[art-treasure] [gemstones]
-	[art-object]
+[art-treasure] [unowned-art-treasure]
+	[unowned-art-treasure]
+	[unowned-art-treasure]
+	[unowned-art-treasure]
+	[owned-art-treasure]
 
 pragma export-rule [art-treasure]
+pragma prefix-with [art-treasure] a(n)
 
-pragma prefix-with [art-treasure] [possesive-title]
-pragma prefix-with [art-treasure-group] a(n)
+[unowned-art-treasure] [gemstones]
+	[art-objects]
+
+[owned-art-treasure] [possesive-title] [unowned-art-treasure]
 
 [possesive-title] [full-name-and-title] 's
 
@@ -29,6 +35,7 @@ pragma prefix-with [art-treasure-group] a(n)
 
 pragma export-rule [art-objects]
 pragma prefix-with [art-objects] [art-object-pref]
+pragma prefix-with [art-objects] [size]
 
 [art-object-pref] counterfeit
 	ancient
@@ -47,28 +54,6 @@ pragma prefix-with [art-objects] [art-object-pref]
 	[mythic-art]
 
 pragma export-rule [art-object]
-pragma prefix-with [art-object] [size]
-
-[gemstones] [gemstone]
-	pair of [gemstone]
-	[gemstone-sizedesc] pile of [gemstone]
-	[gemstone-sizedesc] hoard of [gemstone]
-
-pragma export-rule [gemstones]
-
-[gemstone] [common-gem]
-	[rare-gem]
-	[legendary-gem]
-	[epic-gem]
-
-pragma export-rule [gemstone]
-
-[gemstone-sizedesc] [size]
-	[gemstone-desc]
-	[size] [gemstone-desc]
-	[gemstone-desc] [size]
-
-pragma prefix-with [gemstone] [gemstone-sizedesc]
 
 [size] tiny
 	miniscule
@@ -78,54 +63,6 @@ pragma prefix-with [gemstone] [gemstone-sizedesc]
 	huge
 	titanic
 
-[gemstone-desc] flawless
-	flawed
-	cracked
-	faceted
-	cut
-	uncut
-	fake
-
-[common-gem] amber
-	amethyst
-	garnet
-	moonstone
-	jade
-	pearl
-	peridot
-	turquoise
-
-[rare-gem] alexandrite
-	aquamarine
-	black pearl
-	topaz
-	[quote-commongem] and [quote-commongem]
-	[quote-commongem] and [quote-commongem] fused together
-
-[quote-commongem] ( [common-gem] )
-
-pragma despace-rule [quote-commongem]
-
-[legendary-gem] emerald
-	fire opal
-	sapphire
-	[quote-raregem] and [quote-raregem]
-	[quote-raregem] and [quote-raregem] fused together
-
-[quote-raregem] ( [rare-gem] )
-
-pragma despace-rule [quote-raregem]
-
-[epic-gem] diamond
-	jacinth
-	ruby
-	[quote-epicgem] and [quote-epicgem]
-	[quote-epicgem] and [quote-epicgem] fused together
-
-[quote-epicgem] ( [epic-gem] )
-
-pragma despace-rule [quote-epicgem]
-
 [common-art] [common-goldring]
 	[statuette-mat] statuette
 	gold bracelet
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
diff --git a/RGens/data/server-config-sample.cfg b/RGens/data/server-config-sample.cfg
index dfb675e..cc0dc1f 100644
--- a/RGens/data/server-config-sample.cfg
+++ b/RGens/data/server-config-sample.cfg
@@ -1,7 +1,7 @@
 # Load 'long rules' -- Grammars with one rule with a lot of cases
 animal            sample-grammars/long-data/animal.gram
 canada-province   sample-grammars/long-data/canada-province.gram
-cards              sample-grammars/long-data/cards.gram
+cards             sample-grammars/long-data/cards.gram
 color             sample-grammars/long-data/color.gram
 first-name-female sample-grammars/long-data/first-name-female.gram
 first-name-male   sample-grammars/long-data/first-name-male.gram
@@ -18,8 +18,12 @@ roman-numeral     sample-grammars/long-data/roman-numeral.gram
 syllables         sample-grammars/long-data/syllables.gram
 town-name         sample-grammars/long-data/town-name.gram
 tree              sample-grammars/long-data/tree.gram
+greek-letters     sample-grammars/long-data/greek-letters.gram
+japanese-sylls    sample-grammars/long-data/japanese-writing.gram
 
 # Load grammars
+
+# Set I of grammars
 24hr-rpg           sample-grammars/24hr-rpg.gram
 acronym            sample-grammars/acronym.gram
 address            sample-grammars/address.gram
@@ -38,6 +42,7 @@ dungeon-enviroment sample-grammars/dungeon-enviroment.gram
 elemental          sample-grammars/elementals.gram
 fantasy-locations  sample-grammars/fantasy-locations.gram
 fortune            sample-grammars/fortune.gram
+gemstones          sample-grammars/gemstones.gram
 genre-fiction      sample-grammars/genre-fiction.gram
 horror             sample-grammars/horror.gram
 insults            sample-grammars/insults.gram
@@ -66,7 +71,6 @@ theory             sample-grammars/theory.gram
 trademark          sample-grammars/trademark.gram
 web                sample-grammars/web.gram
 zadrons-pouch      sample-grammars/zadrons-pouch.gram
-# Other grammar files
 
 # Diablo II items
 diabloii-base        sample-grammars/diablo-ii/diabloii.gram
@@ -75,6 +79,16 @@ diabloii-perish      sample-grammars/diablo-ii/diabloiiperish.gram
 diabloii-prefixes    sample-grammars/diablo-ii/diabloiiprefixes.gram
 diabloii-suffixes    sample-grammars/diablo-ii/diabloiisuffixes.gram
 
+# Set II of grammars
+repinsults new-sample-grammars/repinsult.gram
+
+# Drakensang online items
+ds-runes new-sample-grammars/drakensang/runes.gram
+ds-gems  new-sample-grammars/drakensang/gems.gram
+ds-armor new-sample-grammars/drakensang/armor.gram
+
+# Other grammar files
+
 # Dungeon dressing
 abandoned       sample-grammars/dungeondressing/abandoned.gram
 bedroom         sample-grammars/dungeondressing/bedroom.gram
diff --git a/RGens/data/todos.txt b/RGens/data/todos.txt
index ea1862f..1de8841 100644
--- a/RGens/data/todos.txt
+++ b/RGens/data/todos.txt
@@ -1,2 +1,2 @@
-@TODO 10/26/17 Ben Culkin :Greek
-	Add a long rule for greek letters
+:TODO 5/10/18 Ben Culkin :EasternSun
+	Finish up the new-style Diablo generator, using Eastern Sun things