cal/paper-dynasty-discord
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Begun complete_play function

Browse Source
This commit is contained in:
Cal Corum 2024-11-05 12:07:52 -06:00
parent 736897efad
commit 650ffdb147
3 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
command_logic/logic_gameplay.py
View File

@ -14,9 +14,26 @@ from utilities.pages import Pagination
def complete_play(session:Session, this_play: Play): def complete_play(session:Session, this_play: Play):
nbo = this_play.batting_order + 1 if this_play.pa == 1 else this_play.batting_order
if nbo > 9:
nbo = 1
nso = this_play.starting_outs + this_play.outs
nih = this_play.inning_half
if nso >= 3:
nso = 0
nih = 'bot' if this_play.inning_half.lower() == 'top' else 'top'
new_play = Play(
game=this_play.game,
play_num=this_play.play_num + 1,
batting_order=nbo
)
this_play.locked = False this_play.locked = False
this_play.complete = True this_play.complete = True
session.add(this_play) session.add(this_play)
session.add(new_play)
session.commit() session.commit()

2
helpers.py
View File

@ -3105,7 +3105,7 @@ async def open_choice_pack(this_pack, team: dict, context, cardset_id: Optional[
if x not in players: if x not in players:
players.append(x) players.append(x)
if len(players) < 4: if len(players) < 4:
cardset_id = 17 cardset_id = LIVE_CARDSET_ID
else: else:
# Get 4 MVP cards # Get 4 MVP cards
rarity_id = 5 rarity_id = 5

54
in_game/gameplay_models.py
View File

@ -562,8 +562,8 @@ class PlayBase(SQLModel):
inning_num: int = Field(default=1, ge=1) inning_num: int = Field(default=1, ge=1)
batting_order: int = Field(default=1, ge=1, le=9) batting_order: int = Field(default=1, ge=1, le=9)
starting_outs: int = Field(default=0, ge=0, le=2) starting_outs: int = Field(default=0, ge=0, le=2)
away_score: int = Field(default=0) away_score: int = Field(default=0, ge=0)
home_score: int = Field(default=0) home_score: int = Field(default=0, ge=0)
batter_pos: str | None = Field(default=None) batter_pos: str | None = Field(default=None)
in_pow: bool = Field(default=False) in_pow: bool = Field(default=False)
@ -575,28 +575,28 @@ class PlayBase(SQLModel):
on_third_final: int | None = Field(default=None) on_third_final: int | None = Field(default=None)
batter_final: int | None = Field(default=None) batter_final: int | None = Field(default=None)
pa: int = Field(default=0) pa: int = Field(default=0, ge=0, le=1)
ab: int = Field(default=0) ab: int = Field(default=0, ge=0, le=1)
run: int = Field(default=0) run: int = Field(default=0, ge=0, le=1)
e_run: int = Field(default=0) e_run: int = Field(default=0, ge=0, le=1)
hit: int = Field(default=0) hit: int = Field(default=0, ge=0, le=1)
rbi: int = Field(default=0) rbi: int = Field(default=0)
double: int = Field(default=0) double: int = Field(default=0, ge=0, le=1)
triple: int = Field(default=0) triple: int = Field(default=0, ge=0, le=1)
homerun: int = Field(default=0) homerun: int = Field(default=0, ge=0, le=1)
bb: int = Field(default=0) bb: int = Field(default=0, ge=0, le=1)
so: int = Field(default=0) so: int = Field(default=0, ge=0, le=1)
hbp: int = Field(default=0) hbp: int = Field(default=0, ge=0, le=1)
sac: int = Field(default=0) sac: int = Field(default=0, ge=0, le=1)
ibb: int = Field(default=0) ibb: int = Field(default=0, ge=0, le=1)
gidp: int = Field(default=0) gidp: int = Field(default=0, ge=0, le=1)
bphr: int = Field(default=0) bphr: int = Field(default=0, ge=0, le=1)
bpfo: int = Field(default=0) bpfo: int = Field(default=0, ge=0, le=1)
bp1b: int = Field(default=0) bp1b: int = Field(default=0, ge=0, le=1)
bplo: int = Field(default=0) bplo: int = Field(default=0, ge=0, le=1)
sb: int = Field(default=0) sb: int = Field(default=0, ge=0, le=1)
cs: int = Field(default=0) cs: int = Field(default=0, ge=0, le=1)
outs: int = Field(default=0) outs: int = Field(default=0, ge=0, le=3)
wpa: float = Field(default=0) wpa: float = Field(default=0)
re24: float = Field(default=0) re24: float = Field(default=0)
@ -607,10 +607,10 @@ class PlayBase(SQLModel):
check_pos: str | None = Field(default=None) check_pos: str | None = Field(default=None)
error: int = Field(default=0) error: int = Field(default=0)
wild_pitch: int = Field(default=0) wild_pitch: int = Field(default=0, ge=0, le=1)
passed_ball: int = Field(default=0) passed_ball: int = Field(default=0, ge=0, le=1)
pick_off: int = Field(default=0) pick_off: int = Field(default=0, ge=0, le=1)
balk: int = Field(default=0) balk: int = Field(default=0, ge=0, le=1)
complete: bool = Field(default=False) complete: bool = Field(default=False)
locked: bool = Field(default=False) locked: bool = Field(default=False)
is_go_ahead: bool = Field(default=False) is_go_ahead: bool = Field(default=False)