summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/util/levcomp.lpp
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-19 18:02:31 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-19 18:02:31 +0000
commit6e304ee422e24338bde6ca84c420702d7d719993 (patch)
tree08bee3585e67a17a8b946df063185136cd95d148 /crawl-ref/source/util/levcomp.lpp
parentdb54671af1f255d5f886ff79ffe8b2232585f1c3 (diff)
downloadcrawl-ref-6e304ee422e24338bde6ca84c420702d7d719993.tar.gz
crawl-ref-6e304ee422e24338bde6ca84c420702d7d719993.zip
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
Diffstat (limited to 'crawl-ref/source/util/levcomp.lpp')
-rw-r--r--crawl-ref/source/util/levcomp.lpp8
1 files changed, 6 insertions, 2 deletions
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;