Merge branch 'dev' into ui-redesign

This commit is contained in:
Maruno17
2024-09-20 21:30:46 +01:00
15 changed files with 168 additions and 39 deletions

View File

@@ -400,8 +400,22 @@ class Interpreter
result = ($game_switches[@parameters[1]] == (@parameters[2] == 0))
end
when 1 # variable
value1 = $game_variables[@parameters[1]]
value2 = (@parameters[2] == 0) ? @parameters[3] : $game_variables[@parameters[3]]
variable1_name = $data_system.variables[@parameters[1]]
if variable1_name && variable1_name[/^s\:/]
value1 = eval($~.post_match)
else
value1 = $game_variables[@parameters[1]]
end
if @parameters[2] == 0
value2 = @parameters[3]
else
variable2_name = $data_system.variables[@parameters[3]]
if variable2_name && variable2_name[/^s\:/]
value2 = eval($~.post_match)
else
value2 = $game_variables[@parameters[3]]
end
end
case @parameters[4]
when 0 then result = (value1 == value2)
when 1 then result = (value1 >= value2)