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

Move all weather-related code into weather.py

Browse source
This commit is contained in:
hillexed 2021-02-21 18:15:23 -05:00
parent f021cb4ea4
commit 384b644805
3 changed files with 106 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
games.py
View file

@ -628,10 +628,6 @@ class game(object):
if self.inning > self.max_innings and self.teams["home"].score != self.teams["away"].score: #game over if self.inning > self.max_innings and self.teams["home"].score != self.teams["away"].score: #game over
self.over = True self.over = True
def pitcher_insert(self, this_team):
rounds = math.ceil(this_team.lineup_position / len(this_team.lineup))
position = random.randint(0, len(this_team.lineup)-1)
return rounds * len(this_team.lineup) + position
def end_of_game_report(self): def end_of_game_report(self):
return { return {
@ -657,7 +653,6 @@ class game(object):
attempts = self.thievery_attempts() attempts = self.thievery_attempts()
if attempts == False: if attempts == False:
self.last_update = self.batterup() self.last_update = self.batterup()
print(self.last_update[0]) ############# DEBUG REMOVE ME #################
else: else:
self.last_update = attempts self.last_update = attempts
return self.gamestate_display_full() return self.gamestate_display_full()

51
main_controller.py
View file

@ -3,7 +3,6 @@ from leagues import league_structure
from league_storage import league_exists from league_storage import league_exists
from flask import Flask, url_for, Response, render_template, request, jsonify, send_from_directory, abort from flask import Flask, url_for, Response, render_template, request, jsonify, send_from_directory, abort
from flask_socketio import SocketIO, emit from flask_socketio import SocketIO, emit
from gametext import base_string
import database as db import database as db
app = Flask("the-prestige", static_folder='simmadome/build') app = Flask("the-prestige", static_folder='simmadome/build')
@ -159,7 +158,7 @@ def update_loop():
if state["update_pause"] == 1: #generate the top of the inning message before displaying the at bat result if state["update_pause"] == 1: #generate the top of the inning message before displaying the at bat result
state["update_emoji"] = "🍿" state["update_emoji"] = "🍿"
if this_game.over: if this_game.over: # game over message
state["display_inning"] -= 1 state["display_inning"] -= 1
state["display_top_of_inning"] = False state["display_top_of_inning"] = False
winning_team = this_game.teams['home'].name if this_game.teams['home'].score > this_game.teams['away'].score else this_game.teams['away'].name winning_team = this_game.teams['home'].name if this_game.teams['home'].score > this_game.teams['away'].score else this_game.teams['away'].name
@ -171,26 +170,17 @@ def update_loop():
state["update_text"] = f"{winning_team} wins!" state["update_text"] = f"{winning_team} wins!"
state["pitcher"] = "-" state["pitcher"] = "-"
state["batter"] = "-" state["batter"] = "-"
elif this_game.top_of_inning:
state["update_text"] = f"Top of {this_game.inning}. {this_game.teams['away'].name} batting!"
if this_game.weather.name == "Drizzle":
state["update_emoji"] = "🌧"
state["update_text"] += f'Due to inclement weather, {this_game.teams["away"].lineup[(this_game.teams["away"].lineup_position-1) % len(this_game.teams["away"].lineup)].name} is placed on second base.'
elif this_game.weather.name == "Heat Wave" and hasattr(this_game.weather, "home_pitcher") and this_game.weather.home_pitcher.name != state["pitcher"]:
state["update_emoji"] = "🌄"
state["update_text"] += f' {this_game.weather.home_pitcher} is exhausted from the heat. {state["pitcher"]} is forced to pitch!'
else: else:
if this_game.inning >= this_game.max_innings: if this_game.top_of_inning:
if this_game.teams["home"].score > this_game.teams["away"].score: state["update_text"] = f"Top of {this_game.inning}. {this_game.teams['away'].name} batting!"
this_game.victory_lap = True else:
state["update_text"] = f"Bottom of {this_game.inning}. {this_game.teams['home'].name} batting!" if this_game.inning >= this_game.max_innings:
if this_game.weather.name == "Drizzle": if this_game.teams["home"].score > this_game.teams["away"].score:
state["update_emoji"] = "🌧" this_game.victory_lap = True
state["update_text"] += f' Due to inclement weather, {this_game.teams["home"].lineup[(this_game.teams["home"].lineup_position-1) % len(this_game.teams["home"].lineup)].name} is placed on second base.' state["update_text"] = f"Bottom of {this_game.inning}. {this_game.teams['home'].name} batting!"
elif this_game.weather.name == "Heat Wave" and hasattr(this_game.weather, "away_pitcher") and this_game.weather.away_pitcher.name != state["pitcher"]:
state["update_emoji"] = "🌄" this_game.weather.modify_top_of_inning_message(this_game, state)
state["update_text"] += f' {this_game.weather.away_pitcher} is exhausted from the heat. {state["pitcher"]} is forced to pitch!'
elif state["update_pause"] != 1 and this_game.play_has_begun: elif state["update_pause"] != 1 and this_game.play_has_begun:
@ -205,15 +195,7 @@ def update_loop():
state["update_emoji"] = "💎" state["update_emoji"] = "💎"
state["update_text"] = updatestring state["update_text"] = updatestring
elif "mulligan" in this_game.last_update[0].keys(): elif "text_only" in this_game.last_update[0].keys(): #this handles many weather messages
updatestring = ""
punc = ""
if this_game.last_update[0]["defender"] != "":
punc = ", "
state["update_text"] = f"{this_game.last_update[0]['batter']} would have gone out, but they took a mulligan!"
elif "text_only" in this_game.last_update[0].keys():
state["update_text"] = this_game.last_update[0]["text"] state["update_text"] = this_game.last_update[0]["text"]
else: else:
updatestring = "" updatestring = ""
@ -231,13 +213,8 @@ def update_loop():
state["update_emoji"] = "🏏" state["update_emoji"] = "🏏"
state["update_text"] = updatestring state["update_text"] = updatestring
if "veil" in this_game.last_update[0].keys(): this_game.weather.modify_atbat_message(this_game, state)
state["update_text"] += f" {this_game.last_update[0]['batter']}'s will manifests on {base_string(this_game.last_update[1])} base."
elif "error" in this_game.last_update[0].keys():
state["update_text"] = f"{this_game.last_update[0]['batter']}'s hit goes ethereal, and {this_game.last_update[0]['defender']} can't catch it! {this_game.last_update[0]['batter']} reaches base safely."
if this_game.last_update[1] > 0:
updatestring += f"{this_game.last_update[1]} runs scored!"
state["bases"] = this_game.named_bases() state["bases"] = this_game.named_bases()

134
weather.py
View file

@ -1,6 +1,6 @@
import random import random
import math import math
from gametext import appearance_outcomes from gametext import appearance_outcomes, base_string
class Weather: class Weather:
def __init__(self, game): def __init__(self, game):
@ -10,26 +10,34 @@ class Weather:
def __str__(self): def __str__(self):
return f"{self.emoji} {self.name}" return f"{self.emoji} {self.name}"
def activate(self, game, result): def modify_atbat_stats(self, player_rolls):
# activates after the batter calculation. modify result, or just return another thing # Activates before batting
pass
def on_flip_inning(self, game):
pass
def on_choose_next_batter(self, game):
pass pass
def modify_steal_stats(self, roll): def modify_steal_stats(self, roll):
pass pass
def modify_atbat_stats(self, player_rolls): def modify_atbat_roll(self, outcome, roll, defender):
# Activates before batting # activates after batter roll
pass pass
def modify_atbat_roll(self, outcome, roll, defender): def activate(self, game, result):
# activates after the batter calculation. modify result, or just return another thing
pass pass
def on_choose_next_batter(self, game):
pass
def on_flip_inning(self, game):
pass
def modify_top_of_inning_message(self, game, state):
pass
def modify_atbat_message(self, game, state):
pass
class Supernova(Weather): # todo class Supernova(Weather): # todo
def __init__(self, game): def __init__(self, game):
self.name = "Supernova" self.name = "Supernova"
@ -64,8 +72,12 @@ class SlightTailwind(Weather):
if "mulligan" not in game.last_update[0].keys() and not result["ishit"] and result["text"] != appearance_outcomes.walk: if "mulligan" not in game.last_update[0].keys() and not result["ishit"] and result["text"] != appearance_outcomes.walk:
mulligan_roll_target = -((((self.get_batter().stlats["batting_stars"])-5)/6)**2)+1 mulligan_roll_target = -((((self.get_batter().stlats["batting_stars"])-5)/6)**2)+1
if random.random() > mulligan_roll_target and self.get_batter().stlats["batting_stars"] <= 5: if random.random() > mulligan_roll_target and self.get_batter().stlats["batting_stars"] <= 5:
result["mulligan"] = True result.clear()
result["weather_message"] = True result.update({
"text": f"{this_game.last_update[0]['batter']} would have gone out, but they took a mulligan!",
"text_only": True,
"weather_message": True,
})
class HeavySnow(Weather): class HeavySnow(Weather):
def __init__(self, game): def __init__(self, game):
@ -74,29 +86,31 @@ class HeavySnow(Weather):
self.counter_away = random.randint(0,len(game.teams['away'].lineup)-1) self.counter_away = random.randint(0,len(game.teams['away'].lineup)-1)
self.counter_home = random.randint(0,len(game.teams['home'].lineup)-1) self.counter_home = random.randint(0,len(game.teams['home'].lineup)-1)
def activate(self, game, result): self.swapped_batter_data = None
if game.top_of_inning:
offense_team = game.teams["away"]
weather_count = self.counter_away
else:
offense_team = game.teams["home"]
weather_count = self.counter_home
if weather_count == offense_team.lineup_position and "snow_atbat" not in game.last_update[0].keys(): def activate(self, game, result):
if self.swapped_batter_data:
original, sub = self.swapped_batter_data
self.swapped_batter_data = None
result.clear() result.clear()
result.update({ result.update({
"snow_atbat": True, "snow_atbat": True,
"text": f"{offense_team.lineup[offense_team.lineup_position % len(offense_team.lineup)].name}'s hands are too cold! {game.get_batter().name} is forced to bat!", "text": f"{original.name}'s hands are too cold! {sub.name} is forced to bat!",
"text_only": True, "text_only": True,
"weather_message": True, "weather_message": True,
}) })
def on_flip_inning(self, game): def on_flip_inning(self, game):
if game.top_of_inning and self.counter_away < game.teams["away"].lineup_position: if game.top_of_inning and self.counter_away < game.teams["away"].lineup_position:
self.counter_away = game.pitcher_insert(game.teams["away"]) self.counter_away = self.pitcher_insert_index(game.teams["away"])
if not game.top_of_inning and self.counter_home < game.teams["home"].lineup_position: if not game.top_of_inning and self.counter_home < game.teams["home"].lineup_position:
self.counter_home = game.pitcher_insert(game.teams["home"]) self.counter_home = self.pitcher_insert_index(game.teams["home"])
def pitcher_insert_index(self, this_team):
rounds = math.ceil(this_team.lineup_position / len(this_team.lineup))
position = random.randint(0, len(this_team.lineup)-1)
return rounds * len(this_team.lineup) + position
def on_choose_next_batter(self, game): def on_choose_next_batter(self, game):
if game.top_of_inning: if game.top_of_inning:
@ -106,7 +120,8 @@ class HeavySnow(Weather):
bat_team = game.teams["home"] bat_team = game.teams["home"]
counter = self.counter_home counter = self.counter_home
if counter == bat_team.lineup_position: if bat_team.lineup_position == counter:
self.swapped_batter_data = (game.current_batter, bat_team.pitcher) # store this to generate the message during activate()
game.current_batter = bat_team.pitcher game.current_batter = bat_team.pitcher
class Twilight(Weather): class Twilight(Weather):
@ -123,6 +138,13 @@ class Twilight(Weather):
outcome["defender"] = defender outcome["defender"] = defender
roll["pb_system_stat"] = 0.1 roll["pb_system_stat"] = 0.1
def modify_atbat_message(self, this_game, state):
result = this_game.last_update[0]
if "error" in result.keys():
state["update_text"] = f"{result['batter']}'s hit goes ethereal, and {result['defender']} can't catch it! {result['batter']} reaches base safely."
if this_game.last_update[1] > 0:
state["update_text"] += f"{this_game.last_update[1]} runs scored!"
class ThinnedVeil(Weather): class ThinnedVeil(Weather):
def __init__(self,game): def __init__(self,game):
self.name = "Thinned Veil" self.name = "Thinned Veil"
@ -132,18 +154,24 @@ class ThinnedVeil(Weather):
if result["ishit"]: if result["ishit"]:
if result["text"] == appearance_outcomes.homerun or result["text"] == appearance_outcomes.grandslam: if result["text"] == appearance_outcomes.homerun or result["text"] == appearance_outcomes.grandslam:
result["veil"] = True result["veil"] = True
result["weather_message"] = True
def modify_atbat_message(self, game, state):
if "veil" in game.last_update[0].keys():
state["update_emoji"] = self.emoji
state["update_text"] += f" {game.last_update[0]['batter']}'s will manifests on {base_string(game.last_update[1])} base."
class HeatWave(Weather): class HeatWave(Weather):
def __init__(self,game): def __init__(self,game):
self.name = "Heat Wave" self.name = "Heat Wave"
self.emoji = "🌄" + "\uFE00" self.emoji = "🌄" + "\uFE00"
self.counter_away = -1 # random.randint(2,4) self.counter_away = random.randint(2,4)
self.counter_home = -1 # random.randint(2,4) self.counter_home = random.randint(2,4)
self.swapped_pitcher_data = None
def on_flip_inning(self, game): def on_flip_inning(self, game):
current_pitcher = game.get_pitcher() original_pitcher = game.get_pitcher()
if game.top_of_inning: if game.top_of_inning:
bat_team = game.teams["home"] bat_team = game.teams["home"]
counter = self.counter_home counter = self.counter_home
@ -151,19 +179,28 @@ class HeatWave(Weather):
bat_team = game.teams["away"] bat_team = game.teams["away"]
counter = self.counter_away counter = self.counter_away
should_change_pitcher = False if game.inning == counter:
if game.inning >= counter:
should_change_pitcher = True
if game.top_of_inning: if game.top_of_inning:
self.counter_home = self.counter_home - (self.counter_home % 5) + 5 + random.randint(1,4) #rounds down to last 5, adds up to next 5. then adds a random number 2<=x<=5 to determine next pitcher self.counter_home = self.counter_home - (self.counter_home % 5) + 5 + random.randint(1,4) #rounds down to last 5, adds up to next 5. then adds a random number 2<=x<=5 to determine next pitcher
else: else:
self.counter_away = self.counter_away - (self.counter_away % 5) + 5 + random.randint(1,4) self.counter_away = self.counter_away - (self.counter_away % 5) + 5 + random.randint(1,4)
if should_change_pitcher: #swap, accounting for teams where where someone's both batter and pitcher
tries = 0 tries = 0
while game.get_pitcher() == current_pitcher and tries < 3: while game.get_pitcher() == original_pitcher and tries < 3:
bat_team.set_pitcher(use_lineup = True) bat_team.set_pitcher(use_lineup = True)
tries += 1 tries += 1
if game.get_pitcher() != original_pitcher:
self.swapped_pitcher_data = (original_pitcher, game.get_pitcher())
def modify_top_of_inning_message(self, game, state):
if self.swapped_pitcher_data:
original, sub = self.swapped_pitcher_data
self.swapped_pitcher_data = None
state["update_emoji"] = self.emoji
state["update_text"] += f' {original} is exhausted from the heat. {sub} is forced to pitch!'
class Drizzle(Weather): class Drizzle(Weather):
def __init__(self,game): def __init__(self,game):
@ -179,6 +216,18 @@ class Drizzle(Weather):
lineup = game.teams[next_team].lineup lineup = game.teams[next_team].lineup
game.bases[2] = lineup[(game.teams[next_team].lineup_position-1) % len(lineup)] game.bases[2] = lineup[(game.teams[next_team].lineup_position-1) % len(lineup)]
def modify_top_of_inning_message(self, game, state):
if game.top_of_inning:
next_team = "away"
else:
next_team = "home"
placed_player = game.teams[next_team].lineup[(game.teams[next_team].lineup_position-1) % len(game.teams[next_team].lineup)]
state["update_emoji"] = self.emoji
state["update_text"] += f'Due to inclement weather, {placed_player.name} is placed on second base.'
class Sun2(Weather): class Sun2(Weather):
def __init__(self, game): def __init__(self, game):
self.name = "Sun 2" self.name = "Sun 2"
@ -194,6 +243,7 @@ class Sun2(Weather):
result.update({ result.update({
"text": "The {} collect 10! Sun 2 smiles.".format(team.name), "text": "The {} collect 10! Sun 2 smiles.".format(team.name),
"text_only": True, "text_only": True,
"weather_message": True
}) })
class NameSwappyWeather(Weather): class NameSwappyWeather(Weather):
@ -280,14 +330,14 @@ def all_weathers():
#"Supernova" : Supernova, #"Supernova" : Supernova,
#"Midnight": Midnight, #"Midnight": Midnight,
#"Slight Tailwind": SlightTailwind, #"Slight Tailwind": SlightTailwind,
"Heavy Snow": HeavySnow, # works "Heavy Snow": HeavySnow,
"Twilight" : Twilight, # works "Twilight" : Twilight,
"Thinned Veil" : ThinnedVeil, # works "Thinned Veil" : ThinnedVeil,
"Heat Wave" : HeatWave, "Heat Wave" : HeatWave,
"Drizzle" : Drizzle, # works "Drizzle" : Drizzle,
# "Sun 2": Sun2, # "Sun 2": Sun2,
"Feedback": Feedback, "Feedback": Feedback,
"Literacy": NameSwappyWeather, "Literacy": NameSwappyWeather,
} }
return weathers_dic return weathers_dic