zhetadelta/sim16
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

probable fix for #240 and #241

Browse source
This commit is contained in:
Sakimori 2021-06-27 16:55:24 -04:00
parent cd4127cba8
commit a136a940bd
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
games.py
View file

@ -550,7 +550,7 @@ class game(object):
else: else:
result = {} result = {}
self.voice.activate(self.last_update[0], result, self) result = self.voice.activate(self.last_update[0], result, self)
if "twopart" not in result: if "twopart" not in result:
self.weather.activate(self, result) # possibly modify result in-place self.weather.activate(self, result) # possibly modify result in-place

1
gametext.py
View file

@ -66,6 +66,7 @@ class game_strings_base(object):
}) })
else: else:
currentupdate["displaytext"] = f"{currentupdate['batter']} {self.format_gamestring(getattr(self, currentupdate['outcome'].name)[currentupdate['voiceindex']], currentupdate)}" currentupdate["displaytext"] = f"{currentupdate['batter']} {self.format_gamestring(getattr(self, currentupdate['outcome'].name)[currentupdate['voiceindex']], currentupdate)}"
return currentupdate
except: except:
game_strings_base().activate(lastupdate, currentupdate, game) game_strings_base().activate(lastupdate, currentupdate, game)

2
main_controller.py
View file

@ -256,4 +256,4 @@ def update_loop():
socket_thread = threading.Thread(target=socketio.emit, args=("states_update", game_states)) socket_thread = threading.Thread(target=socketio.emit, args=("states_update", game_states))
socket_thread.start() socket_thread.start()
#socketio.emit("states_update", game_states) #socketio.emit("states_update", game_states)
time.sleep(3) time.sleep(8)

2
the_prestige.py
View file

@ -147,7 +147,7 @@ class StartGameCommand(Command):
weather_name = flag[1] weather_name = flag[1]
if weather_name not in weather.all_weathers(): if weather_name not in weather.all_weathers():
raise CommandError("We can't find that weather, chief. Try again.") raise CommandError("We can't find that weather, chief. Try again.")
elif flag[0] == "v": elif flag[0] == "v" or flag[0] == "a":
if flag[1] in gametext.all_voices(): if flag[1] in gametext.all_voices():
voice = gametext.all_voices()[flag[1]] voice = gametext.all_voices()[flag[1]]
else: else: