283375/arcaea-offline
1
0
Fork 0
mirror of https://github.com/283375/arcaea-offline.git synced 2025-04-19 06:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(calc)!: api changes

Browse Source 
- `PlayResults` -> `PlayResult`
- remove expose of `world_step` from `calculate.__init__`
This commit is contained in:
283375 2023-09-20 00:20:32 +08:00
parent 2c73570a65
commit 0c292fc3be
Signed by: 283375
SSH Key Fingerprint: SHA256:UcX0qg6ZOSDOeieKPGokA5h7soykG61nz2uxuQgVLSk
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/arcaea_offline/calculate/__init__.py
View File

@ -6,8 +6,3 @@ from .score import (
calculate_score_range, calculate_score_range,
calculate_shiny_pure, calculate_shiny_pure,
) )
from .world_step import (
calculate_play_rating_from_step,
calculate_step,
calculate_step_original,
)

26
src/arcaea_offline/calculate/world_step.py
View File

@ -2,7 +2,7 @@ from decimal import Decimal
from typing import Literal, Optional, Union from typing import Literal, Optional, Union
class PlayResults: class PlayResult:
def __init__( def __init__(
self, self,
*, *,
@ -114,13 +114,13 @@ class MemoriesStepBooster(StepBooster):
def calculate_step_original( def calculate_step_original(
play_results: PlayResults, play_result: PlayResult,
*, *,
partner_bonus: Optional[PartnerBonus] = None, partner_bonus: Optional[PartnerBonus] = None,
booster: Optional[StepBooster] = None, step_booster: Optional[StepBooster] = None,
): ):
ptt = play_results.play_rating ptt = play_result.play_rating
step = play_results.partner_step step = play_result.partner_step
if partner_bonus: if partner_bonus:
partner_bonus_step = partner_bonus.step_bonus partner_bonus_step = partner_bonus.step_bonus
partner_bonus_multiplier = partner_bonus.final_multiplier partner_bonus_multiplier = partner_bonus.final_multiplier
@ -131,20 +131,20 @@ def calculate_step_original(
play_result = (Decimal("2.45") * ptt.sqrt() + Decimal("2.5")) * (step / 50) play_result = (Decimal("2.45") * ptt.sqrt() + Decimal("2.5")) * (step / 50)
play_result += partner_bonus_step play_result += partner_bonus_step
play_result *= partner_bonus_multiplier play_result *= partner_bonus_multiplier
if booster: if step_booster:
play_result *= booster.final_value() play_result *= step_booster.final_value()
return play_result return play_result
def calculate_step( def calculate_step(
play_results: PlayResults, play_result: PlayResult,
*, *,
partner_bonus: Optional[PartnerBonus] = None, partner_bonus: Optional[PartnerBonus] = None,
booster: Optional[StepBooster] = None, step_booster: Optional[StepBooster] = None,
): ):
play_result_original = calculate_step_original( play_result_original = calculate_step_original(
play_results, partner_bonus=partner_bonus, booster=booster play_result, partner_bonus=partner_bonus, step_booster=step_booster
) )
return round(play_result_original, 1) return round(play_result_original, 1)
@ -155,7 +155,7 @@ def calculate_play_rating_from_step(
partner_step_value: Union[Decimal, str, int, float], partner_step_value: Union[Decimal, str, int, float],
*, *,
partner_bonus: Optional[PartnerBonus] = None, partner_bonus: Optional[PartnerBonus] = None,
booster: Optional[StepBooster] = None, step_booster: Optional[StepBooster] = None,
): ):
step = Decimal(step) step = Decimal(step)
partner_step_value = Decimal(partner_step_value) partner_step_value = Decimal(partner_step_value)
@ -163,8 +163,8 @@ def calculate_play_rating_from_step(
# get original play result # get original play result
if partner_bonus and partner_bonus.final_multiplier: if partner_bonus and partner_bonus.final_multiplier:
step /= partner_bonus.final_multiplier step /= partner_bonus.final_multiplier
if booster: if step_booster:
step /= booster.final_value() step /= step_booster.final_value()
if partner_bonus and partner_bonus.step_bonus: if partner_bonus and partner_bonus.step_bonus:
step -= partner_bonus.step_bonus step -= partner_bonus.step_bonus