Cheese-water/gameshell
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Added conditional evaluation to dialogs. Conditionals for the NPC have been tested, for the player have not.

Browse source
This commit is contained in:
Patrick Marsee 2019-05-31 21:37:52 -04:00
parent b332d579e9
commit ed7fe60a6d
3 changed files with 94 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

35
gamebase.py
View file

@ -232,6 +232,23 @@ Returns (thing, x, y). "Thing" can be None."""
else:
raise GameError('Invalid argument to getValueFromString: {}'.format(arg))
return val
def compareValues(self, operator: str, left: str, right: str):
"""Generalized comparisons, may eventually be extended to other operators"""
lval = self.getValueFromString(left)
rval = self.getValueFromString(right)
if operator == '==':
return lval == rval
elif operator == '!=':
return lval != rval
elif operator == '<=':
return lval <= rval
elif operator == '>=':
return lval >= rval
elif operator == '<':
return lval < rval
elif operator == '>':
return lval > rval
# commands
@ -876,26 +893,12 @@ Object can be the name of the object, or its coordinates."""
raise GameError('Incomplete If statement: if {}'.format(' '.join(args)))
# evaluate condition
val = self.parseValue(args[0])
if args[1] in ('==', '!=', '<=', '>=', '<', '>'):
if len(args) < 4:
raise GameError('Incomplete If statement: if {}'.format(' '.join(args)))
val2 = self.parseValue(args[2])
if args[1] == '==':
ret = val == val2
elif args[1] == '!=':
ret = val != val2
elif args[1] == '<=':
ret = val <= val2
elif args[1] == '>=':
ret = val >= val2
elif args[1] == '<':
ret = val < val2
elif args[1] == '>':
ret = val > val2
args = args[3:]
ret = self.compareValues(args[1], args[0], args[2])
else:
ret = bool(val)
ret = bool(self.parseValue(args[0]))
args = args[1:]
if inverse:
ret = not ret