diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/misc/nimble.gram | 3 | ||||
| -rw-r--r-- | data/new-sample-grammars/drakensang/gems.gram | 17 | ||||
| -rw-r--r-- | data/new-sample-grammars/dungeonfantasy-treasure/household-items.gram | 6 | ||||
| -rw-r--r-- | data/new-sample-grammars/dungeonfantasy-treasure/valuable-materials.gram | 18 | ||||
| -rw-r--r-- | data/new-sample-grammars/gems.gram | 2 | ||||
| -rw-r--r-- | data/new-sample-grammars/noble-jewlery.gram | 24 | ||||
| -rw-r--r-- | data/new-sample-grammars/nonweapon-prof.gram | 8 | ||||
| -rw-r--r-- | data/new-sample-grammars/perchance/meal.gram | 4 | ||||
| -rwxr-xr-x | data/sample-grammars/pokeattacks.gram | 10 | ||||
| -rwxr-xr-x | data/sample-grammars/superhero.gram | 18 | ||||
| -rwxr-xr-x | data/server-config-sample.gcfg | 20 |
11 files changed, 89 insertions, 41 deletions
diff --git a/data/misc/nimble.gram b/data/misc/nimble.gram index 0408011..dee0862 100755 --- a/data/misc/nimble.gram +++ b/data/misc/nimble.gram @@ -18,7 +18,8 @@ [nimble] [bimble] -[nimble-bimble] [bimble] +[nimble-bimble] <^2> {empty} + [bimble] pragma prefix-with [nimble-bimble] [nimble-plural] pragma suffix-with [nimble-bimble] [nimble-plural] diff --git a/data/new-sample-grammars/drakensang/gems.gram b/data/new-sample-grammars/drakensang/gems.gram index 8ce0467..adec6c8 100644 --- a/data/new-sample-grammars/drakensang/gems.gram +++ b/data/new-sample-grammars/drakensang/gems.gram @@ -2,13 +2,13 @@ [gem-type] of qaizah [unique-gem] -pragma prefix-with [ds-gem] [gem-adjective] -pragma prefix-with [ds-gem] [gem-quality] +pragma prefix-with [ds-gem] [gem-adjective] [gem-quality] pragma initial-rule [ds-gem] [gem-quality] <^2> [gem-quality-normal] - [gem-quality-alt] + [gem-quality-alt-1] + [gem-quality-alt-2] [gem-quality-normal] flawed splintered @@ -19,20 +19,15 @@ pragma initial-rule [ds-gem] sacred royal -[gem-quality-alt] [gem-quality-alt-1] - [gem-quality-alt-2] - -[gem-quality-alt-1] lesser +[gem-quality-alt-1] <^2> lesser cut cruciate astral - -[gem-quality-alt-2] lesser small large huge -[gem-adjective] crystal +[gem-adjective] <?2> crystal festive solstice @@ -86,5 +81,7 @@ pragma prefix-with [unique-trail-1] [gem-descr] [unique-type] bloodstone moonstone + sunstone + starstone pragma prefix-with [unique-type] [gem-descr] [gem-descr] diff --git a/data/new-sample-grammars/dungeonfantasy-treasure/household-items.gram b/data/new-sample-grammars/dungeonfantasy-treasure/household-items.gram index fdec9cc..597fd7b 100644 --- a/data/new-sample-grammars/dungeonfantasy-treasure/household-items.gram +++ b/data/new-sample-grammars/dungeonfantasy-treasure/household-items.gram @@ -6,6 +6,8 @@ [grooming] [personal] +pragma initial-rule [household-item] + [cooking] basin bowl bucket @@ -43,14 +45,14 @@ [painting] encaustic painting oil painting - [tempera|watercolor] painting + [tempera||watercolor] painting pennant [sculpture] [scul-mat] [scul-fig] [scul-mat] clay bone - [porcelain|faience] + [porcelain||faience] stone wood ivory diff --git a/data/new-sample-grammars/dungeonfantasy-treasure/valuable-materials.gram b/data/new-sample-grammars/dungeonfantasy-treasure/valuable-materials.gram index 0177432..8b30be5 100644 --- a/data/new-sample-grammars/dungeonfantasy-treasure/valuable-materials.gram +++ b/data/new-sample-grammars/dungeonfantasy-treasure/valuable-materials.gram @@ -12,13 +12,13 @@ # Other # - Expand generic entries (distilled liquour/tea/wine) -[valuable-material] [spices] +[valuable-materials] [spices] [fabrics] [other-valuable] -pragma export-rule [valuable-materials] +pragma initial-rule [valuable-materials] -[spices] {@smods:=[spices-mod]} [spices-1]` +[spices] {@smods:=[spices-mod]} [spices-1] [spices-1] allspice anise @@ -70,11 +70,11 @@ pragma export-rule [valuable-materials] pragma prefix-with [spices-1] <&0..2> [@smods] pragma export-rule [spices] -[fabrics] <^2> [cloth] cloth {$unit=100sqft} {$unit+:=bolt} - [%common-pelt|%exotic-pelt] fur {$unit=100sqft} {$unit+:=bundle} - [%common-pelt|%exotic-pelt|contraband|%other-pelt] leather {$unit=100sqft} {$unit+:=bundle} - scale-hide {$unit=100sqft} {$unit+:=bundle} - [fiber] fibers {$unit=pound} +[fabrics] <^2> [cloth] cloth + [%(common-pelt)||%(exotic-pelt)] fur + [%(common-pelt)||%(exotic-pelt)||contraband||%(other-pelt)] leather + scale-hide + [fiber] fibers [cloth] [other-cloth] giant-spider silk @@ -161,7 +161,7 @@ pragma export-rule [fabrics] cedar resin copal frankincense - <?4> [%common-pelt|exotic-pelt] musk + <?4> [%(common-pelt)||(exotic-pelt)] musk myrrh onycha patchouli diff --git a/data/new-sample-grammars/gems.gram b/data/new-sample-grammars/gems.gram index 4a93395..0780d9c 100644 --- a/data/new-sample-grammars/gems.gram +++ b/data/new-sample-grammars/gems.gram @@ -47,7 +47,7 @@ pragma initial-rule [gems] topaz tourmaline -[gems] black opal +[jewels] black opal black sapphire diamond emerald diff --git a/data/new-sample-grammars/noble-jewlery.gram b/data/new-sample-grammars/noble-jewlery.gram index 9224dd4..3527375 100644 --- a/data/new-sample-grammars/noble-jewlery.gram +++ b/data/new-sample-grammars/noble-jewlery.gram @@ -1,6 +1,6 @@ -[noble-jewlery] +#[noble-jewlery] [noble- -pragma initial-rule [noble-jewlery] +#pragma initial-rule [noble-jewlery] [jewlery-material] [jewlery-material-1] [jewlery-material-1] and [jewlery-material-1] @@ -95,6 +95,26 @@ pragma despace-rule [gem-size] [gem-color] <^19> [gem-color-1] [gem-color-2] +[gem-color-1] bright crimson + blood red + orange + bright yellow + yellow ochre + yellow green + forest green + teal + sky blue + cerulean + phthalo blue + violet + lavender + pink + brown + grey + white + clear + black + [gem-color-2] [gem-color-1] and [gem-color-1] [gem-pattern] [gem-pattern] striated diff --git a/data/new-sample-grammars/nonweapon-prof.gram b/data/new-sample-grammars/nonweapon-prof.gram index 00edc40..03df454 100644 --- a/data/new-sample-grammars/nonweapon-prof.gram +++ b/data/new-sample-grammars/nonweapon-prof.gram @@ -1,4 +1,10 @@ -[nonweapon-prof] +[nonweapon-prof] [general-prof] + [priest] + [rogue] + [warrior] + [wizard] + +pragma initial-rule [nonweapon-prof] [general-prof] agriculture animal handling diff --git a/data/new-sample-grammars/perchance/meal.gram b/data/new-sample-grammars/perchance/meal.gram index fa73c23..410bc7d 100644 --- a/data/new-sample-grammars/perchance/meal.gram +++ b/data/new-sample-grammars/perchance/meal.gram @@ -1,6 +1,6 @@ [meal] It's a [adjective] dish with [type] [main] . The [adjective] [main] is paired with a [size] serving of [condiment] . - A [main] with with a bit of [condiment] and some [adjective] [side] on top . + A [main] with a bit of [condiment] and some [adjective] [side] on top . pragma export-rule [meal] @@ -25,7 +25,7 @@ pragma export-rule [meal] unusually fresh roasted -[size] [(small||smol)||(large||hueg)||(tiny||teeny)] +[size] [([small||smol])||([large||hueg])||([tiny||teeny])] [condiment] <^2> pepper salt diff --git a/data/sample-grammars/pokeattacks.gram b/data/sample-grammars/pokeattacks.gram index dcbd770..8c192f2 100755 --- a/data/sample-grammars/pokeattacks.gram +++ b/data/sample-grammars/pokeattacks.gram @@ -1,4 +1,4 @@ -[pokeattack] {@oword:=[word-1]} {@tword:=[word-2]} {@ptype:=[poke-type]} [act-pokeattack] +[pokeattack] {@ptype:=[poke-type]} [act-pokeattack] [act-pokeattack] [pokeattack-name] @@ -11,7 +11,9 @@ pragma suffix-with [act-pokeattack] [move-kind] pragma suffix-with [act-pokeattack] [attack-type] pragma suffix-with [act-pokeattack] [attack-pp] -[pokeattack-name] <^2> <&1..2> [@oword] [@oword] +[pokeattack-name] {@oword:=[word-1]} {@tword:=[word-2]} [act-pokeattack-name] + +[act-pokeattack-name] <^2> <&1..2> [@oword] [@oword] <^2> <&1..2> [@tword] [@tword] <^2> [@oword] [@tword] <^2> [@tword] [@oword] @@ -57,8 +59,8 @@ pragma suffix-with [word-11] [seperator] pragma prefix-with [word-21] [seperator] -pragma prefix-with [pokeattack-name] [word-11] -pragma suffix-with [pokeattack-name] [word-21] +pragma prefix-with [act-pokeattack-name] [word-11] +pragma suffix-with [act-pokeattack-name] [word-21] [word-1] acid aerial diff --git a/data/sample-grammars/superhero.gram b/data/sample-grammars/superhero.gram index b9fab59..a997410 100755 --- a/data/sample-grammars/superhero.gram +++ b/data/sample-grammars/superhero.gram @@ -280,17 +280,19 @@ pragma suffix-with [third-part] [fifth-part] <^2> [exalt-type] <^2> [arcana] -[exalt-type] Dawn - Zenith - Twilight - Night - Eclipse +[exalt-type] [Dawn||Zenith||Twilight||Night||Eclipse] + [Dusk||Midnight||Daybreak||Day||Midnight] + [Full||Waxing||Half||No] Moon + Chosen of [Journeys||Serenity||Battle||Endings||Secrets] + [Herald||Disciple||Crusader||Shephard] -[arcana] [%tarot-card||%alt-tarot-card] +[arcana] [%(tarot-card)||%(alt-tarot-card)] Minor Arcana Major Arcana <^3> [ordinal-arcana] -[ordinal-arcana] {empty} +[ordinal-arcana] <^2> {empty} + Arcana [%ordinal||%(ordinal-roman)] + [ordinal-number] Arcana -pragma prefix-with [ordinal-arcana] Arcana [%ordinal||%ordinal-roman||%ordinal-number] +#pragma prefix-with [ordinal-arcana] Arcana [%ordinal||%(ordinal-roman)||%(ordinal-number)] diff --git a/data/server-config-sample.gcfg b/data/server-config-sample.gcfg index 95939a8..3408a4b 100755 --- a/data/server-config-sample.gcfg +++ b/data/server-config-sample.gcfg @@ -84,10 +84,20 @@ load grammar diabloii-suffixes sample-grammars/diablo-ii/diabloiisuffixes.gra load grammar turboghoul-hats sample-grammars/vaultsofnagoh/turboghoul-hats.gram # RPG tools -load grammar wand rpg-tools-cd/wands.gram +load grammar harlot rpg-tools-cd/harlot.gram +load grammar magic-weapon rpg-tools-cd/magic-weapon.gram +load grammar metalgear rpg-tools-cd/metalgear.gram +load grammar plothook rpg-tools-cd/plothook.gram +load grammar profession rpg-tools-cd/profession.gram +load grammar treasure rpg-tools-cd/treasure.gram +load grammar wands rpg-tools-cd/wands.gram # Set II of grammars load grammar cbs new-sample-grammars/cbs.gram +load grammar chargen new-sample-grammars/chargen.gram +load grammar gems new-sample-grammars/gems.gram +load grammar noble-jewlery new-sample-grammars/noble-jewlery.gram +load grammar nonweapon-prof new-sample-grammars/nonweapon-prof.gram load grammar repinsults new-sample-grammars/repinsult.gram # Drakensang online items @@ -95,9 +105,17 @@ load grammar ds-runes new-sample-grammars/drakensang/runes.gram load grammar ds-gems new-sample-grammars/drakensang/gems.gram load grammar ds-armor new-sample-grammars/drakensang/armor.gram +# DungeonFantasy +load grammar household-items new-sample-grammars/dungeonfantasy-treasure/household-items.gram +#load grammar mundane-materials new-sample-grammars/dungeonfantasy-treasure/mundane-materials.gram +load grammar valuable-materials new-sample-grammars/dungeonfantasy-treasure/valuable-materials.gram + # Perchance sample grammars load grammar meal new-sample-grammars/perchance/meal.gram +# Springhole generators +load grammar earthen-names new-sample-grammars/springhole/earthen-names.gram + # Other grammar files # Dungeon dressing |