Merge branch 'master' of ssh://10.65.77.3/home/bjculkin/git/rgens

7 files changed, 87 insertions, 28 deletions

diff --git a/RGens/.classpath b/RGens/.classpath
index d978244..7d5ca02 100644
--- a/RGens/.classpath
+++ b/RGens/.classpath
@@ -1,22 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" output="target/classes" path="src/main/java">

+		<attributes>

+			<attribute name="optional" value="true"/>

+			<attribute name="maven.pomderived" value="true"/>

+		</attributes>

+	</classpathentry>

+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

+		<attributes>

+			<attribute name="maven.pomderived" value="true"/>

+		</attributes>

+	</classpathentry>

+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">

+		<attributes>

+			<attribute name="optional" value="true"/>

+			<attribute name="maven.pomderived" value="true"/>

+		</attributes>

+	</classpathentry>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

+		<attributes>

+			<attribute name="maven.pomderived" value="true"/>

+		</attributes>

+	</classpathentry>

+	<classpathentry excluding="**" kind="src" output="target/classes" path="data">

+		<attributes>

+			<attribute name="maven.pomderived" value="true"/>

+		</attributes>

+	</classpathentry>

+	<classpathentry kind="output" path="target/classes"/>

+</classpath>

diff --git a/RGens/.settings/org.eclipse.core.resources.prefs b/RGens/.settings/org.eclipse.core.resources.prefs
index e9441bb..382b70b 100644
--- a/RGens/.settings/org.eclipse.core.resources.prefs
+++ b/RGens/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding/<project>=UTF-8
+encoding/data=UTF-8
diff --git a/RGens/data/misc/nimble.gram b/RGens/data/misc/nimble.gram
new file mode 100644
index 0000000..3567777
--- /dev/null
+++ b/RGens/data/misc/nimble.gram
@@ -0,0 +1,30 @@
+[nimble-bimble] [bimble]
+
+pragma prefix-with [nimble-bimble] [nimble-plural]
+pragma suffix-with [nimble-bimble] [nimble-plural]
+
+pragma initial-rule [nimble-bimble]
+
+[nimble-plural] [nimble-art] [nimble]
+
+[bimble] bimble
+	nimble
+	bimble
+	nimble
+	bimble
+	nimble
+	dindle
+	symbol
+	frindle
+	kindle
+	titties
+
+[nimble-art] the
+	my
+	her
+	all over
+	this
+	while they
+	a
+
+[nimble] [bimble]
diff --git a/RGens/data/sample-grammars/rtwiki/class.gram b/RGens/data/sample-grammars/rtwiki/class.gram
new file mode 100644
index 0000000..8fcb17c
--- /dev/null
+++ b/RGens/data/sample-grammars/rtwiki/class.gram
@@ -0,0 +1,11 @@
+[Utility/Class] Barbarian
+	Bard
+	Cleric
+	Druid
+	Fighter
+	Monk
+	Paladin
+	Ranger
+	Rogue
+	Sorceror
+	Wizard
diff --git a/RGens/data/sample-grammars/zadrons-pouch.gram b/RGens/data/sample-grammars/zadrons-pouch.gram
index 61d928d..f72cf25 100755
--- a/RGens/data/sample-grammars/zadrons-pouch.gram
+++ b/RGens/data/sample-grammars/zadrons-pouch.gram
@@ -68,13 +68,20 @@ pragma export-rule [zadrons-item]
 	[card]
 	[card]
 
-[crys-sphere] → [sphere-type] spheres
+[crys-sphere] → crystal of [crystal-type]
+	[crys-act]
+	[crys-act]
+	[crys-act]
+	[crys-act]
+
+[crys-act] → [sphere-type] spheres
 	[sphere-type] sphere
 	lens of [lens-type]
 	[crystal-type] sphere
-	crystal of [crystal-type]
-	crystal ball
-	crystal ball of [crys-suffix]
+	ball
+	ball of [crys-suffix]
+
+pragma prefix-with [crys-act] crystal
 
 [sphere-type] → microphonic
 	seeing-eye
diff --git a/RGens/data/server-config-sample.cfg b/RGens/data/server-config-sample.cfg
index 145971d..dfb675e 100644
--- a/RGens/data/server-config-sample.cfg
+++ b/RGens/data/server-config-sample.cfg
@@ -98,4 +98,5 @@ traits       sample-grammars/rtwiki/traits.gram
 seniordesign seniordesign/dbdata.gram
 
 # Misc
-700000items misc/700000items.gram
+700000items   misc/700000items.gram
+nimble-bimble misc/nimble.gram
diff --git a/RGens/pom.xml b/RGens/pom.xml
index b0de95c..2a80462 100644
--- a/RGens/pom.xml
+++ b/RGens/pom.xml
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>bjc</groupId>
 			<artifactId>BJC-Utils2</artifactId>
-			<version>0.1.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 		</dependency>
 
 		<dependency>