diff --git a/card_output.py b/card_output.py index 770d2f9..73698d4 100644 --- a/card_output.py +++ b/card_output.py @@ -164,19 +164,20 @@ async def main(argv): ] this_output.append(rarity) - batter_rg_output.append([ + this_batter_rg = [ player.sba_id, cardset.id, player.name, player.hand, vl_ratings.homerun, vl_ratings.bp_homerun, vl_ratings.triple, vl_ratings.double_three, vl_ratings.double_two, vl_ratings.double_pull, vl_ratings.single_two, vl_ratings.single_one, vl_ratings.single_center, vl_ratings.bp_single, vl_ratings.hbp, vl_ratings.walk, vl_ratings.strikeout, vl_ratings.lineout, vl_ratings.popout, vl_ratings.flyout_a, vl_ratings.flyout_bq, vl_ratings.flyout_lf_b, vl_ratings.flyout_rf_b, - vl_ratings.groundout_a, vl_ratings.groundout_b, vl_ratings.groundout_c, vr_ratings.homerun, vr_ratings.bp_homerun, + vl_ratings.groundout_a, vl_ratings.groundout_b, vl_ratings.groundout_c, vr_ratings.homerun, + vr_ratings.bp_homerun, vr_ratings.triple, vr_ratings.double_three, vr_ratings.double_two, vr_ratings.double_pull, vr_ratings.single_two, vr_ratings.single_one, vr_ratings.single_center, vr_ratings.bp_single, vr_ratings.hbp, vr_ratings.walk, vr_ratings.strikeout, vr_ratings.lineout, vr_ratings.popout, vr_ratings.flyout_a, vr_ratings.flyout_bq, vr_ratings.flyout_lf_b, vr_ratings.flyout_rf_b, vr_ratings.groundout_a, vr_ratings.groundout_b, vr_ratings.groundout_c, rarity - ]) + ] all_positions = Position.select().where((Position.player == player) & (Position.cardset == cardset)) pos_list = [x for x in all_positions] @@ -191,6 +192,10 @@ async def main(argv): "Y" if this_batter_data.st_auto else "N", this_batter_data.st_jump ]) + this_batter_rg.extend([ + this_batter_data.running, this_batter_data.st_high, this_batter_data.st_low, + "Y" if this_batter_data.st_auto else "N", this_batter_data.st_jump + ]) this_output.extend([ position_string, this_batter_data.stealing, this_batter_data.bunting, this_batter_data.hit_and_run, this_batter_data.running @@ -273,7 +278,9 @@ async def main(argv): vr_ratings.hbp, vr_ratings.walk, vr_ratings.strikeout, vr_ratings.fo_center, vr_ratings.fo_slap, vr_ratings.groundout_a, vr_ratings.groundout_b, vr_ratings.xcheck_p, vr_ratings.xcheck_c, vr_ratings.xcheck_1b, vr_ratings.xcheck_2b, vr_ratings.xcheck_3b, vr_ratings.xcheck_ss, - vr_ratings.xcheck_lf, vr_ratings.xcheck_cf, vr_ratings.xcheck_rf + vr_ratings.xcheck_lf, vr_ratings.xcheck_cf, vr_ratings.xcheck_rf, this_data.starter_rating, + this_data.relief_rating, this_data.closer_rating, this_data.hold, this_data.wild_pitch, + this_data.balk ]) p_def = Position.get_or_none( @@ -307,9 +314,9 @@ async def main(argv): print(f'Done processing players; outputting to {output_path}') write_to_csv(output_path, f'batter-card-output-{now.strftime("%Y-%m-%d-%f")}', batter_output) write_to_csv(output_path, f'batter-rg-output-{now.strftime("%Y-%m-%d-%f")}', batter_rg_output) - write_to_csv(output_path, f'batter-baserunning-{now.strftime("%Y-%m-%d-%f")}', baserunning_output) + # write_to_csv(output_path, f'batter-baserunning-{now.strftime("%Y-%m-%d-%f")}', baserunning_output) write_to_csv(output_path, f'pitcher-card-output-{now.strftime("%Y-%m-%d-%f")}', pitcher_output) - write_to_csv(output_path, f'pitcher-peripherals-{now.strftime("%Y-%m-%d-%f")}', pitcher_peripherals_output) + # write_to_csv(output_path, f'pitcher-peripherals-{now.strftime("%Y-%m-%d-%f")}', pitcher_peripherals_output) write_to_csv(output_path, f'pitcher-rg-output-{now.strftime("%Y-%m-%d-%f")}', pitcher_rg_output) write_to_csv(output_path, f'player-json-{now.strftime("%Y-%m-%d-%f")}', player_json_output) write_to_csv(output_path, f'defense-rg-{now.strftime("%Y-%m-%d-%f")}', defense_rg_output)