Refactor kill and death prediction inputs in app.py. Introduced a selection box for users to choose between predicting kills/deaths or using averages, enhancing user experience. Updated input validation to ensure minimum values are set correctly, improving data integrity in team performance projections.

app.py

@@ -71,20 +71,30 @@ with st.sidebar:
         index=0
     )
 
-    kill_prediction = st.number_input(
-        "Predicted Team Kills",
-        min_value=0,
-        max_value=100,
-        value=20
-    )
-    
-    death_prediction = st.number_input(
-        "Predicted Team Deaths",
-        min_value=0,
-        max_value=100,
-        value=5
+    game_settings = st.selectbox(
+        "Predict kills/deaths or use average?",
+        options=["Average", "Predict"],
+        index=0
     )
 
+    if game_settings == "Average":
+        kill_prediction = 0
+        death_prediction = 0
+    else:
+        kill_prediction = st.number_input(
+            "Predicted Team Kills",
+            min_value=1,
+            max_value=100,
+            value=20
+        )
+        
+        death_prediction = st.number_input(
+            "Predicted Team Deaths",
+            min_value=1,
+            max_value=100,
+            value=5
+        )
+
 @st.cache_data(ttl = 60)
 def init_team_data(team, win_loss, kill_prediction, death_prediction, start_date, end_date):  
         
@@ -241,20 +251,36 @@ def init_team_data(team, win_loss, kill_prediction, death_prediction, start_date
         raw_display['playername_avg_death_share_loss'] = raw_display['playername_avg_deaths_loss'] / raw_display['teamname_avg_deaths_loss']
         raw_display['playername_avg_assist_share_loss'] = raw_display['playername_avg_assists_loss'] / raw_display['teamname_avg_kills_loss']
         raw_display['playername_avg_cs_share_loss'] = raw_display['playername_avg_total_cs_loss'] / raw_display['teamname_avg_total_cs_loss']
-        raw_display = raw_display[['playername', 'teamname', 'playername_avg_kill_share_win', 'playername_avg_death_share_win', 'playername_avg_assist_share_win', 'playername_avg_total_cs_win', 'playername_avg_kill_share_loss', 'playername_avg_death_share_loss', 'playername_avg_assist_share_loss', 'playername_avg_total_cs_loss']]
-        raw_display = raw_display.rename(columns = {'playername_avg_kill_share_win': 'wKill%', 'playername_avg_death_share_win': 'wDeath%', 'playername_avg_assist_share_win': 'wAssist%', 'playername_avg_total_cs_win': 'wCS', 'playername_avg_kill_share_loss': 'lKill%', 'playername_avg_death_share_loss': 'lDeath%', 'playername_avg_assist_share_loss': 'lAssist%', 'playername_avg_total_cs_loss': 'lCS'})
-        team_data = raw_display.drop_duplicates(subset = ['playername'])
-
-        if win_loss == "Win":
-            team_data['Kill_Proj'] = team_data['wKill%'] * kill_prediction
-            team_data['Death_Proj'] = team_data['wDeath%'] * death_prediction
-            team_data['Assist_Proj'] = team_data['wAssist%'] * kill_prediction
-            team_data = team_data[['playername', 'teamname', 'wKill%', 'wDeath%', 'wAssist%', 'wCS', 'Kill_Proj', 'Death_Proj', 'Assist_Proj']]
+        if kill_prediction > 0:
+            raw_display = raw_display[['playername', 'teamname', 'playername_avg_kill_share_win', 'playername_avg_death_share_win', 'playername_avg_assist_share_win', 'playername_avg_total_cs_win', 'playername_avg_kill_share_loss', 'playername_avg_death_share_loss', 'playername_avg_assist_share_loss', 'playername_avg_total_cs_loss']]
+            raw_display = raw_display.rename(columns = {'playername_avg_kill_share_win': 'wKill%', 'playername_avg_death_share_win': 'wDeath%', 'playername_avg_assist_share_win': 'wAssist%', 'playername_avg_total_cs_win': 'wCS', 'playername_avg_kill_share_loss': 'lKill%', 'playername_avg_death_share_loss': 'lDeath%', 'playername_avg_assist_share_loss': 'lAssist%', 'playername_avg_total_cs_loss': 'lCS'})
+            team_data = raw_display.drop_duplicates(subset = ['playername'])
+
+            if win_loss == "Win":
+                team_data['Kill_Proj'] = team_data['wKill%'] * kill_prediction
+                team_data['Death_Proj'] = team_data['wDeath%'] * death_prediction
+                team_data['Assist_Proj'] = team_data['wAssist%'] * kill_prediction
+                team_data = team_data[['playername', 'teamname', 'wKill%', 'wDeath%', 'wAssist%', 'wCS', 'Kill_Proj', 'Death_Proj', 'Assist_Proj']]
+            else:
+                team_data['Kill_Proj'] = team_data['lKill%'] * kill_prediction
+                team_data['Death_Proj'] = team_data['lDeath%'] * death_prediction
+                team_data['Assist_Proj'] = team_data['lAssist%'] * kill_prediction
+                team_data = team_data[['playername', 'teamname', 'lKill%', 'lDeath%', 'lAssist%', 'lCS', 'Kill_Proj', 'Death_Proj', 'Assist_Proj']]
         else:
-            team_data['Kill_Proj'] = team_data['lKill%'] * kill_prediction
-            team_data['Death_Proj'] = team_data['lDeath%'] * death_prediction
-            team_data['Assist_Proj'] = team_data['lAssist%'] * kill_prediction
-            team_data = team_data[['playername', 'teamname', 'lKill%', 'lDeath%', 'lAssist%', 'lCS', 'Kill_Proj', 'Death_Proj', 'Assist_Proj']]
+            raw_display = raw_display[['playername', 'teamname', 'playername_avg_kill_win', 'playername_avg_death_win', 'playername_avg_assist_win', 'playername_avg_total_cs_win', 'playername_avg_kill_loss', 'playername_avg_death_loss', 'playername_avg_assist_loss', 'playername_avg_total_cs_loss']]
+            raw_display = raw_display.rename(columns = {'playername_avg_kill_win': 'wKill%', 'playername_avg_death_win': 'wDeath%', 'playername_avg_assist_win': 'wAssist%', 'playername_avg_total_cs_win': 'wCS', 'playername_avg_kill_loss': 'lKill%', 'playername_avg_death_loss': 'lDeath%', 'playername_avg_assist_loss': 'lAssist%', 'playername_avg_total_cs_loss': 'lCS'})
+            team_data = raw_display.drop_duplicates(subset = ['playername'])
+
+            if win_loss == "Win":
+                team_data['Kill_Proj'] = team_data['wKill%']
+                team_data['Death_Proj'] = team_data['wDeath%']
+                team_data['Assist_Proj'] = team_data['wAssist%']
+                team_data = team_data[['playername', 'teamname', 'wKill%', 'wDeath%', 'wAssist%', 'wCS', 'Kill_Proj', 'Death_Proj', 'Assist_Proj']]
+            else:
+                team_data['Kill_Proj'] = team_data['lKill%']
+                team_data['Death_Proj'] = team_data['lDeath%']
+                team_data['Assist_Proj'] = team_data['lAssist%']
+                team_data = team_data[['playername', 'teamname', 'lKill%', 'lDeath%', 'lAssist%', 'lCS', 'Kill_Proj', 'Death_Proj', 'Assist_Proj']]
 
         return team_data.dropna().reset_index(drop=True)