Merge branch 'working'

1 files changed, 0 insertions, 135 deletions

diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
deleted file mode 100755
index f090292..0000000
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
+++ /dev/null
@@ -1,135 +0,0 @@
-[perishables] [perishable-type] of [perishable-effect]
-	[perishable-effect] [perishable-type]
-	[bodypart] of [perishable-effect]
-
-pragma export-rule [perishables]
-
-[bodypart] heart
-	brain
-	jawbone
-	eye
-	ear
-	horn
-	tail
-	fang
-	quill
-	scalp
-	spleen
-	soul
-	bone
-	skull
-	blood
-	ribcage
-<<<<<<< HEAD
-	viscera
-	flesh
-	claw
-=======
->>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1
-
-[perishable-type] potion
-	oil
-	herb
-	elixir
-	resin
-	flask
-	spice
-	salve
-
-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
-	explosive
-	fulminating
-	[gas-type] gas
-	acidity
-	energizing
-	strengthening
-	empowering
-	artful
-	skillful
-	adroit
-	sturdiness
-	hardy
-	robust
-	sage
-	shrewd
-	vivid
-	indigo
-	cerulean
-	russet
-	vermilion
-	crackling
-	forked
-	swart
-	atramentous
-	vital
-	enduring
-	urgent
-	fleet
-	brisk
-	swift
-	dazzling
-	fascinating
-	bright
-	solar
-	omniscience
-	mystical
-	arcane
-	strength
-	dexterity
-	vitality
-	intelligence
-	chi
-	spectralness
-	fire
-	ice
-	lightning
-	magic
-	psionic
-	poison
-	energy
-	accuracy
-	damage
-	defense
-	life
-	power
-	accuracy
-	precision
-	mastery
-	sharpness
-	pain
-	savagery
-	death
-	hardening
-	imperviousness
-	immunity
-	skill
-	fortitude
-	blacksmith’s
-	blacksmithing
-	permanence
-	enchantment
-	enchanting
-
-[restore-effect] healing
-	mana
-	rejuvenation
-	chi
-
-[gas-type] rancid
-	choking
-	strangling