diff options
| author | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-05-29 15:41:21 -0300 |
|---|---|---|
| committer | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-05-29 15:41:21 -0300 |
| commit | ca0f67d2fcb400974a0af1036d563c5cd2588bda (patch) | |
| tree | 77989e2c3cf4a8429ca31f8f2f40f355438df418 /RGens/data/sample-grammars/diablo-ii | |
| parent | 9356498bebab9342222cd87be669abae9d7ac3a2 (diff) | |
| parent | 66f5a43dee94657a56141c093488eccbf64c7ae1 (diff) | |
Merge
Diffstat (limited to 'RGens/data/sample-grammars/diablo-ii')
4 files changed, 25 insertions, 0 deletions
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] |