From 6e304ee422e24338bde6ca84c420702d7d719993 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Wed, 19 Nov 2008 18:02:31 +0000 Subject: Separate CHANCE and WEIGHT. CHANCE is a probability, WEIGHT is a raw number used as a generation weight (i.e. WEIGHT is what the old CHANCE used to be). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7501 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/util/levcomp.lpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/util/levcomp.lpp') diff --git a/crawl-ref/source/util/levcomp.lpp b/crawl-ref/source/util/levcomp.lpp index 590cd59122..41d3b60b0f 100644 --- a/crawl-ref/source/util/levcomp.lpp +++ b/crawl-ref/source/util/levcomp.lpp @@ -236,7 +236,7 @@ ORIENT: { CBEGIN(ARGUMENT); return ORIENT; } PLACE: { CBEGIN(ARGUMENT); return PLACE; } WELCOME: { CBEGIN(ARGUMENT); return WELCOME; } CHANCE: return CHANCE; -WEIGHT: return CHANCE; +WEIGHT: return WEIGHT; FLAGS: { CBEGIN(KEYWORDS); return TAGS; } TAGS: { CBEGIN(KEYWORDS); return TAGS; } LFLAGS: { CBEGIN(ARGUMENT); return LFLAGS; } @@ -258,7 +258,11 @@ KMASK: { CBEGIN(ARGUMENT); return KMASK; } , return COMMA; -[0-9]+ { +: return COLON; + +% return PERC; + +[+-]?[0-9]+ { clean(); yylval.i = atoi(yytext); return INTEGER; -- cgit v1.2.3-54-g00ecf