diff options
17 files changed, 227 insertions, 64 deletions
diff --git a/RGens/data/new-sample-grammars/drakensang/armor.gram b/RGens/data/new-sample-grammars/drakensang/armor.gram index d559761..d559761 100755..100644 --- a/RGens/data/new-sample-grammars/drakensang/armor.gram +++ b/RGens/data/new-sample-grammars/drakensang/armor.gram diff --git a/RGens/data/new-sample-grammars/drakensang/gems.gram b/RGens/data/new-sample-grammars/drakensang/gems.gram index 655bdcb..655bdcb 100755..100644 --- a/RGens/data/new-sample-grammars/drakensang/gems.gram +++ b/RGens/data/new-sample-grammars/drakensang/gems.gram diff --git a/RGens/data/new-sample-grammars/drakensang/runes.gram b/RGens/data/new-sample-grammars/drakensang/runes.gram index 28c12f0..28c12f0 100755..100644 --- a/RGens/data/new-sample-grammars/drakensang/runes.gram +++ b/RGens/data/new-sample-grammars/drakensang/runes.gram diff --git a/RGens/data/sample-grammars/diablo-ii/diabloii.gram b/RGens/data/sample-grammars/diablo-ii/diabloii.gram index 2f3041a..238330d 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloii.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloii.gram @@ -44,9 +44,29 @@ pragma prefix-with [money-type] [metal-type] gold platinum +<<<<<<< HEAD +[item] [item-types] + [item-types] + [item-types] + [item-types] + [item-types] [d2-suffix] + [item-types] [d2-suffix] + [d2-prefix] [item-types] + [d2-prefix] [item-types] + [d2-prefix] [item-types] [d2-suffix] + +[item-types] [d2-item-type] + [d2-item-type] + [ds-items] + +[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 8450b97..6997521 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram @@ -20,10 +20,13 @@ [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 b70919a..f090292 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram @@ -20,6 +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 2087352..c8ffd83 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram @@ -4,6 +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/diablo-ii/diabloiisuffixes.gram b/RGens/data/sample-grammars/diablo-ii/diabloiisuffixes.gram index f737daf..f6deea0 100755 --- a/RGens/data/sample-grammars/diablo-ii/diabloiisuffixes.gram +++ b/RGens/data/sample-grammars/diablo-ii/diabloiisuffixes.gram @@ -1,4 +1,16 @@ -[suffix] [damage-reduction] +[d2-suffix] of [suffix-part] + of [suffix-part] + of [suffix-chain] + +[suffix-chain] [suffix-part] and [suffix-part] + [suffix-part] and [suffix-part] + [suffix-part] and of [suffix-part] + [suffix-part] and of [suffix-part] + [suffix-part] , [suffix-part] and [suffix-part] + +pragma export-rule [d2-suffix] + +[suffix-part] [damage-reduction] [defense-effect] [durability] [hitpoints] @@ -20,7 +32,7 @@ [weapon-use] [spell-casting] -pragma export-rule [suffix] +pragma prefix-with [suffix-part] the [damage-reduction] health protection @@ -34,11 +46,11 @@ pragma export-rule [suffix] [durability] sturdiness structure - the ages + ages bonding unity -[hitpoints] the [hitpoints-act] +[hitpoints] [hitpoints-act] [hitpoints-act] jackal fox @@ -55,60 +67,60 @@ pragma export-rule [suffix] dexterity magic strength - the lynx + lynx zest skill - the mind + mind might - the leopard + leopard vim accuracy brilliance power - the jaguar + jaguar vigor precision sorcery - the giant - the tiger + giant + tiger life perfection wizardry - the titan - the lion - the sky - the moon - the stars - the heavens - the zodiac + titan + lion + sky + moon + stars + heavens + zodiac [cursed] tears pain brittleness decay fragility - the vulture + vulture disease atrophy dyslexia weakness - the cat - the pit + cat + pit illness paralysis draining frailty - the rat + rat trouble pox corruption infection ruin - the exposed + exposed discord - the night - the dark - the void + night + dark + void passivity snail fool @@ -117,13 +129,13 @@ pragma export-rule [suffix] regrowth [memorization] warding - the sentinel + sentinel guarding negation osmosis -[combat-action] the apprentice - the magus +[combat-action] apprentice + magus balance stability harmony @@ -135,9 +147,9 @@ pragma export-rule [suffix] [light-source] light radiance - the sun + sun -[hazard-reduction] the thief +[hazard-reduction] thief warmth remedy amelioration @@ -150,7 +162,7 @@ pragma export-rule [suffix] slaying gore devastation - the jester + jester carnage slaughter @@ -174,24 +186,24 @@ pragma export-rule [suffix] fire lightning venom - the glacier + glacier burning thunder pestilence vileness - the crusaders + crusaders destruction peril - the bear - the grizzly + bear + grizzly -[attack-restore] the leech - the claw - the bat +[attack-restore] leech + claw + bat blood - the talon - the vampire - the lamprey + talon + vampire + lamprey [item-damage] piercing breaking diff --git a/RGens/data/sample-grammars/dungeondressing/bedroom.gram b/RGens/data/sample-grammars/dungeondressing/bedroom.gram index c1345d5..8bb9449 100755 --- a/RGens/data/sample-grammars/dungeondressing/bedroom.gram +++ b/RGens/data/sample-grammars/dungeondressing/bedroom.gram @@ -1,4 +1,4 @@ -[bedroom] you enter the [bedroom-type] and see a [bedroom-bed] with a [bedroom-person] [bedroom-lying] +[bedroom] you enter the [bedroom-type] and see a(n) [bedroom-bed] with a(n) [bedroom-person] [bedroom-lying] pragma initial-rule [bedroom] @@ -26,14 +26,15 @@ pragma initial-rule [bedroom] tropical rope hammock altar -pragma prefix-with [bedroom-bed] [unholy] pragma prefix-with [bedroom-bed] [bed-prefix] +pragma prefix-with [bedroom-bed] [sacred-type] [bed-prefix] ruined ancient legendary + pristine -[unholy] unholy +[sacred-type] unholy holy blessed dammed @@ -42,8 +43,11 @@ pragma prefix-with [bedroom-bed] [bed-prefix] hallowed unhallowed sacred + infernal + angelic -[bedroom-person] pile of [bone-status] bones +[bedroom-person] [bed-bones] + [bed-bones] jug of moonshine [bed-aliveperson] [bed-aliveperson] @@ -60,6 +64,7 @@ pragma prefix-with [bedroom-bed] [bed-prefix] draped atop it prostrated before it [tied] to it + [tied] to it trapped in it [bed-aliveperson] [bed-arist] @@ -67,9 +72,17 @@ pragma prefix-with [bedroom-bed] [bed-prefix] [bed-prost] [bed-slave] [humanoid] - [creature] + [bed-inhuman] + +[bed-inhuman] [creature] + [monster] + [creature-epic] pragma prefix-with [bed-aliveperson] [bed-status] +pragma prefix-with [bed-aliveperson] [bed-name] + +[bed-name] [full-name] , a(n) + [fantasy-name] , a(n) [bed-status] [bed-status1] [bed-status2] @@ -86,27 +99,63 @@ pragma prefix-with [bed-aliveperson] [bed-status] [status-alive] unconcious sleeping normal + fainted [bed-status2] bleeding badly wounded uninjured pale burnt + trembling + scared + aroused [tied] chained tied bound + secured + fastened + handcuffed + roped + shackled [onin] on in -[bed-bones] pile of [bone-status] [bones] - pile of [bone-status] [part-human] [bones] +[bed-bones] [pile] of [bone-status] [bones] + [pile] of [bone-status] [bones] + [pile] of [bone-status] [part-human] [bones] + [pile] of [bone-status] [part-human] [bones] + [blood-puddle] + +[pile] pair + couple + group + pile + hoard + collection + set + +[blood-puddle] puddle of blood + puddle of [part-human] blood [bones] bones flesh viscera skulls + claws + hearts + brains + jawbones + eyes + ears + horns + tails + fangs + quills + scalps + spleens + souls [bone-status] clean old @@ -114,10 +163,13 @@ pragma prefix-with [bed-aliveperson] [bed-status] moldy dusty bloody + ancient + +[bed-arist] [aristocrat] + [part-human] [aristocrat] + [part-human] -[bed-arist] kidnapped [aristocrat] - kidnapped [part-human] [aristocrat] - kidnapped [part-human] +pragma prefix-with [bed-arist] kidnapped [aristocrat] aristocrat prince @@ -126,24 +178,41 @@ pragma prefix-with [bed-aliveperson] [bed-status] queen mercenary merchant + [generic-title] -[bed-doll] sex doll - sex doll of a [part-human] +[bed-doll] [doll] + [doll] of a [part-human] +[doll] doll + mannequin + puppet + +pragma prefix-with [bed-doll] [sex] pragma prefix-with [bed-doll] [realism] +[sex] sex + sexy + [realism] realistic unrealistic - [beauty] + [realism-beauty] + +[realism-beauty] [beauty] + unrealistic [beauty] + realistic [beauty] [beauty] beautiful pretty cute + attractive + normal ugly + unattractive pragma prefix-with [realism] creepily [bed-prost] prostitute + wench pragma prefix-with [bed-prost] [part-human] @@ -155,18 +224,32 @@ pragma prefix-with [bed-slave] [part-human] [bed-gender] male female -[part-human] [part-human1] +[part-human] [humanoids] + [part-human2] pragma prefix-with [part-human] [bed-gender] -[part-human1] [humanoid] - [half-human] +[part-human2] [half-humans] + [quarter-humans] + +[half-humans] [half-human] [half-human] , [half-human] - [quarter-human] -[half-human] half- [humanoid] +[quarter-humans] [quarter-human] + [quarter-human] , [half-human] + [quarter-human] , [quarter-human] + [quarter-human] , [quarter-human] , [quarter-human] + [quarter-human] , [quarter-human] , [quarter-human] , [quarter-human] + +[half-human] half- [humanoids] -[quarter-human] quarter- [humanoid] +[quarter-human] quarter- [humanoids] + +[humanoids] [humanoid] + [humanoid] + [humanoid] + [humanoid] + [bed-inhuman] pragma despace-rule [half-human] pragma despace-rule [quarter-human] diff --git a/RGens/data/sample-grammars/eastern-sun/easternsunsocketing.gram b/RGens/data/sample-grammars/eastern-sun/easternsunsocketing.gram index 3585220..3585220 100755..100644 --- a/RGens/data/sample-grammars/eastern-sun/easternsunsocketing.gram +++ b/RGens/data/sample-grammars/eastern-sun/easternsunsocketing.gram diff --git a/RGens/data/sample-grammars/gemstones.gram b/RGens/data/sample-grammars/gemstones.gram index 8f8a579..8f8a579 100755..100644 --- a/RGens/data/sample-grammars/gemstones.gram +++ b/RGens/data/sample-grammars/gemstones.gram diff --git a/RGens/data/sample-grammars/long-data/greek-letters.gram b/RGens/data/sample-grammars/long-data/greek-letters.gram index 5976bd1..5976bd1 100755..100644 --- a/RGens/data/sample-grammars/long-data/greek-letters.gram +++ b/RGens/data/sample-grammars/long-data/greek-letters.gram diff --git a/RGens/data/sample-grammars/long-data/japanese-writing.gram b/RGens/data/sample-grammars/long-data/japanese-writing.gram index f18c6bc..f18c6bc 100755..100644 --- a/RGens/data/sample-grammars/long-data/japanese-writing.gram +++ b/RGens/data/sample-grammars/long-data/japanese-writing.gram diff --git a/RGens/data/sample-grammars/rtwiki/color.gram b/RGens/data/sample-grammars/rtwiki/color.gram index d6c5402..346f73b 100755 --- a/RGens/data/sample-grammars/rtwiki/color.gram +++ b/RGens/data/sample-grammars/rtwiki/color.gram @@ -1,8 +1,10 @@ [color-phrases] [color-phrase] - [color-phrase] blended with [color-phrase] + [multi-color-phrases] + +[multi-color-phrases] [color-phrase] blended with [color-phrase] a blend between [color-phrase] , [color-phrase] and [color-phrase] - between [color-phrase] and [color-phrase] - between [color-phrase] , [color-phrase] and [color-phrase] + something between [color-phrase] and [color-phrase] + something between [color-phrase] , [color-phrase] and [color-phrase] pragma initial-rule [color-phrases] diff --git a/RGens/data/sample-grammars/rtwiki/death-cause.gram b/RGens/data/sample-grammars/rtwiki/death-cause.gram index 627a3ee..74e58e8 100755 --- a/RGens/data/sample-grammars/rtwiki/death-cause.gram +++ b/RGens/data/sample-grammars/rtwiki/death-cause.gram @@ -99,4 +99,10 @@ by crucifixion by act of god +[Monster/Animals] {{empty}} + +[Character/Torture] {{empty}} + +[Character/Deaths] {{empty}} + pragma export-rule [death-cause] diff --git a/RGens/data/sample-grammars/rtwiki/guns.gram b/RGens/data/sample-grammars/rtwiki/guns.gram index 139e349..269aa0d 100755 --- a/RGens/data/sample-grammars/rtwiki/guns.gram +++ b/RGens/data/sample-grammars/rtwiki/guns.gram @@ -1,5 +1,24 @@ +[gun-phrase] [quote-gunname] was released today + [quote-gunname] vs. [quote-gunname] shootout + [quote-guncorp] is going out of business + [quote-guncorp] was bought by [quote-guncorp] + +[quote-gunname] ( [gun-name] ) + +[quote-guncorp] ( [guncorp] ) + +pragma initial-rule [gun-phrase] + [gun-name] [1gun-name] [2gun-name2] + [1gun-name] + [2gun-name2] + [1gun-name] + [2gun-name2] + [2gun-name1] [2gun-name2] + [2gun-name1] [1gun-name] + [1gun-name] [2gun-name2] + [2gun-name1] [1gun-name] [2gun-name2] pragma prefix-with [gun-name] [2gun-name1] diff --git a/RGens/todos.txt b/RGens/todos.txt index e7cc9bd..e4e39cd 100755 --- a/RGens/todos.txt +++ b/RGens/todos.txt @@ -48,6 +48,9 @@ Add a generalized form of despace-rule that allows inserting arbitray text between rule bits. Maybe call it 'intersperse-rule'? -@TOD 5/10/18 Ben Culkin :RuleInclusion +@TODO 5/10/18 Ben Culkin :RuleInclusion Add some way to sort of 'import' a rules body into another rule so as to not throw off probability by splitting. + +@TODO 5/18/18 Ben Culkin :PragmaErrors + Give better error messages for malformed pragmas |