From: bluelads <blu...@us...> - 2012-02-29 13:25:23
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/common/grammar In directory vz-cvs-4.sog:/tmp/cvs-serv7270/src/games/stendhal/common/grammar Modified Files: Grammar.java Log Message: Adding "magic" to objects which don't have a plural form (like money and sheep) which is different from the singular form and deleting wrong plural form out of words.txt (fixes bug ID: 3490164) Index: Grammar.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/common/grammar/Grammar.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Grammar.java 11 Dec 2011 23:32:05 -0000 1.12 --- Grammar.java 29 Feb 2012 13:25:21 -0000 1.13 *************** *** 498,502 **** } else if (enoun.endsWith("money") || enoun.endsWith("dice") || enoun.endsWith("sheep") || enoun.equals("deer") ! || enoun.equals("moose")) { return enoun + postfix; --- 498,502 ---- } else if (enoun.endsWith("money") || enoun.endsWith("dice") || enoun.endsWith("sheep") || enoun.equals("deer") ! || enoun.equals("moose") || enoun.equals("magic")){ return enoun + postfix; *************** *** 605,609 **** || enoun.endsWith("sheep") || enoun.endsWith("legs") || enoun.endsWith("boots") ! || enoun.equals("deer") || enoun.equals("moose")) { return enoun + postfix; --- 605,609 ---- || enoun.endsWith("sheep") || enoun.endsWith("legs") || enoun.endsWith("boots") ! || enoun.equals("deer") || enoun.equals("moose") || enoun.equals("magic")) { return enoun + postfix; |