diff options
Diffstat (limited to 'RGens/data/sample-grammars/diablo-ii/diabloii.gram')
| -rwxr-xr-x | RGens/data/sample-grammars/diablo-ii/diabloii.gram | 20 |
1 files changed, 20 insertions, 0 deletions
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 |