Merge remote-tracking branch 'upstream/indev' into indev

games.py

@@ -108,6 +108,14 @@ class team(object):
         else:
             return (None, None, None)
 
+    def average_stars(self):
+        total_stars = 0
+        for _player in self.lineup:
+            total_stars += _player.stlats["batting_stars"]
+        for _player in self.rotation:
+            total_stars += _player.stlats["pitching_stars"]
+        return total_stars/(len(self.lineup) + len(self.rotation))
+
     def swap_player(self, name):
         this_player, index, roster = self.find_player(name)
         if this_player is not None and len(roster) > 1:

leagues.py

@@ -1,19 +0,0 @@
-import time, asyncio, jsonpickle
-import database as db
-
-
-
-
-
-class league(object):
-    def __init__(self, name, subleagues_dic):
-        self.subleagues = {} #key: name, value: [divisions]
-        self.max_days
-        self.day = 1
-        self.name = name
-        self.subleagues = subleagues_dic
-
-class division(object):
-    def __init__(self):
-        self.teams = {} #key: team name, value: {wins; losses; run diff}
-

main_controller.py

@@ -1,4 +1,4 @@
-import asyncio, time, datetime, games, json, threading, jinja2, leagues
+import asyncio, time, datetime, games, json, threading, jinja2
 from flask import Flask, url_for, Response, render_template, request, jsonify
 from flask_socketio import SocketIO, emit
 

static/css/common.css

@@ -1,7 +1,7 @@
 @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");
+    background-image: url("naturalblack.png");
 }
 /* Background pattern from Toptal Subtle Patterns */
 

the-prestige.pyproj

@@ -29,9 +29,6 @@
     <Compile Include="debug storage.py">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="leagues.py">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="main_controller.py">
       <SubType>Code</SubType>
     </Compile>
@@ -60,16 +57,28 @@
     <Content Include="games_config.json" />
     <Content Include="ids" />
     <Content Include="matteo.db" />
+    <Content Include="static\css\common.css" />
+    <Content Include="static\css\game.css" />
+    <Content Include="static\css\games_page.css" />
+    <Content Include="static\css\game_page.css" />
+    <Content Include="static\css\prism.png" />
     <Content Include="static\discord.png" />
-    <Content Include="static\game.html" />
-    <Content Include="static\games_page.css" />
-    <Content Include="static\loader.js" />
-    <Content Include="static\prism.png" />
+    <Content Include="static\img\base_empty.png" />
+    <Content Include="static\img\base_filled.png" />
+    <Content Include="static\img\out_in.png" />
+    <Content Include="static\img\out_out.png" />
+    <Content Include="static\js\game_loader.js" />
+    <Content Include="static\js\grid_loader.js" />
+    <Content Include="templates\base.html" />
     <Content Include="templates\game.html" />
+    <Content Include="templates\game_box.html" />
     <Content Include="templates\index.html" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="static\" />
+    <Folder Include="static\css\" />
+    <Folder Include="static\img\" />
+    <Folder Include="static\js\" />
     <Folder Include="templates\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />

the_prestige.py

@@ -1,4 +1,4 @@
-import discord, json, math, os, roman, games, asyncio, random, main_controller, threading, time, leagues, urllib
+import discord, json, math, os, roman, games, asyncio, random, main_controller, threading, time, urllib
 import database as db
 import onomancer as ono
 from flask import Flask
@@ -302,6 +302,7 @@ class SwapPlayerCommand(Command):
     description = "Swaps a player from lineup to rotation, or from rotation to lineup. Requires team ownership."
 
     async def execute(self, msg, command):
+        try:
             team_name = command.split("\n")[1].strip()
             player_name = command.split("\n")[2].strip()
             team, owner_id = games.get_team_and_owner(team_name)
@@ -318,6 +319,8 @@ class SwapPlayerCommand(Command):
                 await msg.channel.send(embed=build_team_embed(team))
                 games.update_team(team)
                 await msg.channel.send("Paperwork signed, stamped, copied, and faxed up to the goddess. Xie's pretty quick with this stuff.")
+        except IndexError:
+            await msg.channel.send("Three lines, remember? Command, then team, then name.")
 
 class MovePlayerCommand(Command):
     name = "move"
@@ -328,6 +331,7 @@ class MovePlayerCommand(Command):
     description = "Moves a player in your lineup or rotation. Requires team ownership."
 
     async def execute(self, msg, command):
+        try:
             team_name = command.split("\n")[1].strip()
             player_name = command.split("\n")[2].strip()
             team, owner_id = games.get_team_and_owner(team_name)
@@ -346,6 +350,8 @@ class MovePlayerCommand(Command):
                 await msg.channel.send(embed=build_team_embed(team))
                 games.update_team(team)
                 await msg.channel.send("Paperwork signed, stamped, copied, and faxed up to the goddess. Xie's pretty quick with this stuff.")
+        except IndexError:
+            await msg.channel.send("Four lines, remember? Command, then team, then name, and finally, new spot on the lineup or rotation.")
 
 class AddPlayerCommand(Command):
     name = "addplayer"
@@ -355,6 +361,7 @@ class AddPlayerCommand(Command):
     description = "Recruits a new player to your team, as either a pitcher or a batter. Requires team ownership."
 
     async def execute(self, msg, command):
+        try:
             team_name = command.split("\n")[1].strip()
             player_name = command.split("\n")[2].strip()
             team, owner_id = games.get_team_and_owner(team_name)
@@ -376,6 +383,8 @@ class AddPlayerCommand(Command):
             await msg.channel.send(embed=build_team_embed(team))
             games.update_team(team)
             await msg.channel.send("Paperwork signed, stamped, copied, and faxed up to the goddess. Xie's pretty quick with this stuff.")
+        except IndexError:
+            await msg.channel.send("Three lines, remember? Command, then team, then name.")
 
 class DeletePlayerCommand(Command):
     name = "removeplayer"
@@ -384,6 +393,7 @@ class DeletePlayerCommand(Command):
     [player name]"""
 
     async def execute(self, msg, command):
+        try:
             team_name = command.split("\n")[1].strip()
             player_name = command.split("\n")[2].strip()
             team, owner_id = games.get_team_and_owner(team_name)
@@ -399,6 +409,8 @@ class DeletePlayerCommand(Command):
                 await msg.channel.send(embed=build_team_embed(team))
                 games.update_team(team)
                 await msg.channel.send("Paperwork signed, stamped, copied, and faxed up to the goddess. Xie's pretty quick with this stuff.")
+        except IndexError:
+            await msg.channel.send("Three lines, remember? Command, then team, then name.")
 
 
 class HelpCommand(Command):