From 18c399602095116e391f7daebacbe86a03305cc6 Mon Sep 17 00:00:00 2001 From: InspectorCaracal Date: Sun, 9 Oct 2022 21:33:11 -0600 Subject: [PATCH] do single-number check AFTER conversion from ordinal --- evennia/utils/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 1bf11f73e6..1830ca9946 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -2793,10 +2793,6 @@ def str2int(number): except: pass - if i := _STR2INT_MAP.get(number): - # it's a single number, return it - return i - # convert sound changes for generic ordinal numbers if number[-2:] == "th": # remove "th" @@ -2810,6 +2806,10 @@ def str2int(number): # custom case for ninth elif number[-3:] == "nin": number += "e" + + if i := _STR2INT_MAP.get(number): + # it's a single number, return it + return i # split number words by spaces, hyphens and commas, to accommodate multiple styles numbers = [ word.lower() for word in re.split(r'[-\s\,]',number) if word ]