From 46528deb5eeb912e4ef65e0ff41a3d32d27c5d14 Mon Sep 17 00:00:00 2001 From: Sakimori Date: Wed, 30 Dec 2020 02:48:39 -0500 Subject: [PATCH] adjusted game diplay for half-inning changeover, changed title of web page --- main_controller.py | 7 +++++-- sql scripts/batting average leaders.sql | 8 ++++++++ sql scripts/pitching leaders.sql | 9 +++++++++ static/discord.png | Bin 0 -> 9103 bytes static/games_page.css | 14 ++++++++++---- static/loader.js | 2 +- templates/index.html | 17 +++-------------- the-prestige.pyproj | 1 + weather_notes.txt | 12 ++++++++++++ 9 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 sql scripts/batting average leaders.sql create mode 100644 sql scripts/pitching leaders.sql create mode 100644 static/discord.png create mode 100644 weather_notes.txt diff --git a/main_controller.py b/main_controller.py index ddcd3b6..c8a6d1e 100644 --- a/main_controller.py +++ b/main_controller.py @@ -44,6 +44,8 @@ def update_loop(): state["update_text"] = "Play blall!" #they also need a timestamp state["delay"] -= 1 + state["display_top_of_inning"] = state["top_of_inning"] + if state["delay"] <= 0: if this_game.top_of_inning != state["top_of_inning"]: state["update_pause"] = 2 @@ -51,6 +53,7 @@ def update_loop(): state["batter"] = "-" if not state["top_of_inning"]: state["display_inning"] -= 1 + state["display_top_of_inning"] = False if state["update_pause"] == 1: state["update_emoji"] = "🍿" @@ -90,7 +93,7 @@ def update_loop(): state["bases"] = this_game.named_bases() - state["top_of_inning"] = this_game.top_of_inning + state["top_of_inning"] = this_game.top_of_inning states_to_send[game_time] = state @@ -100,4 +103,4 @@ def update_loop(): state["update_pause"] -= 1 socketio.emit("states_update", states_to_send) - time.sleep(1) \ No newline at end of file + time.sleep(3) \ No newline at end of file diff --git a/sql scripts/batting average leaders.sql b/sql scripts/batting average leaders.sql new file mode 100644 index 0000000..e731e6d --- /dev/null +++ b/sql scripts/batting average leaders.sql @@ -0,0 +1,8 @@ +SELECT name, + plate_appearances - (walks_taken + sacrifices) as atbats, + ROUND(hits*1.0 / (plate_appearances - (walks_taken + sacrifices)*1.0),3) as average, + ROUND(total_bases*1.0 / (plate_appearances - (walks_taken + sacrifices)*1.0),3) as slg, + ROUND((walks_taken + hits)*1.0/plate_appearances*1.0,3) as obp, + ROUND((walks_taken + hits)*1.0/plate_appearances*1.0,3) + ROUND(total_bases*1.0 / (plate_appearances - (walks_taken + sacrifices)*1.0),3) as ops +FROM stats WHERE plate_appearances > 50 +ORDER BY ops DESC; \ No newline at end of file diff --git a/sql scripts/pitching leaders.sql b/sql scripts/pitching leaders.sql new file mode 100644 index 0000000..d4885fb --- /dev/null +++ b/sql scripts/pitching leaders.sql @@ -0,0 +1,9 @@ +SELECT name, + outs_pitched, + ROUND(runs_allowed*27.0/(outs_pitched*1.0),3) as era, + ROUND((walks_allowed+hits_allowed)*3.0/(outs_pitched*1.0),3) as whip, + ROUND(walks_allowed*27.0/(outs_pitched*1.0),3) as bbper9, + ROUND(strikeouts_given*27.0/(outs_pitched*1.0),3) as kper9, + ROUND(strikeouts_given*1.0/walks_allowed*1.0,3) as kperbb +FROM stats WHERE outs_pitched > 150 +ORDER BY bbper9 ASC; \ No newline at end of file diff --git a/static/discord.png b/static/discord.png new file mode 100644 index 0000000000000000000000000000000000000000..49dde81caf2a4540b8a55358784bbccc007c2b58 GIT binary patch literal 9103 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 literal 0 HcmV?d00001 diff --git a/static/games_page.css b/static/games_page.css index 10fe41b..f862acd 100644 --- a/static/games_page.css +++ b/static/games_page.css @@ -1,4 +1,5 @@ @import url('https://fonts.googleapis.com/css2?family=Alegreya&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Goldman:wght@700&display=swap'); body { background-image: url("prism.png"); } @@ -21,12 +22,17 @@ body { grid-row: 1; } -.h1 { - margin: auto; - width: 45%; - font-family: 'Alegreya', serif; +.link{ + position: relative; + top: 10px; } +.page_header { + color: white; + font-family: 'Goldman', cursive; +} + + .emptyslot { border: 2px dashed white; border-radius: 15px; diff --git a/static/loader.js b/static/loader.js index bb7190f..9591338 100644 --- a/static/loader.js +++ b/static/loader.js @@ -50,7 +50,7 @@ $(document).ready(function (){ const updateGame = (gamediv, gamestate) => { gamediv.id = "updateTarget"; - $('#updateTarget .inning').html("Inning: " + (gamestate.top_of_inning ? "🔼" : "🔽") + " " + gamestate.display_inning + "/" + gamestate.max_innings); + $('#updateTarget .inning').html("Inning: " + (gamestate.display_top_of_inning ? "🔼" : "🔽") + " " + gamestate.display_inning + "/" + gamestate.max_innings); $('#updateTarget .weather').html(gamestate.weather_emoji + " " + gamestate.weather_text); $('#updateTarget .away_name').html(gamestate.away_name); diff --git a/templates/index.html b/templates/index.html index af42576..debd205 100644 --- a/templates/index.html +++ b/templates/index.html @@ -11,22 +11,11 @@
-
-

game page ahoy

+
+

THE SIMMADOME

+

Join SIBR on to start your own games!

-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/the-prestige.pyproj b/the-prestige.pyproj index 5f782b1..2b928ed 100644 --- a/the-prestige.pyproj +++ b/the-prestige.pyproj @@ -57,6 +57,7 @@ + diff --git a/weather_notes.txt b/weather_notes.txt new file mode 100644 index 0000000..06f6eff --- /dev/null +++ b/weather_notes.txt @@ -0,0 +1,12 @@ +fog + hit by pitch, pickoffs + hbp can either hit leg (reduces baserunning) or arm (reduces defense) + +heat wave + forces relief pitchers + +blizzard + makes pitchers bat + +light drizzle + runners start on second base at the start of each inning \ No newline at end of file