Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 642491f410 | |||
| c9f1a72dc8 | |||
| d4f712e826 | |||
| a8cd1bc89d | |||
| e5bd157c62 | |||
| 63e32758c4 | |||
| 4b2f5f5ba7 |
@@ -17,7 +17,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Python setup
|
- name: Python setup
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5.1.1
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python_version }}
|
python-version: ${{ matrix.python_version }}
|
||||||
architecture: x64
|
architecture: x64
|
||||||
@@ -63,7 +63,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Python setup
|
- name: Python setup
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5.1.1
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python_version }}
|
python-version: ${{ matrix.python_version }}
|
||||||
architecture: ${{ matrix.target }}
|
architecture: ${{ matrix.target }}
|
||||||
@@ -99,7 +99,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Python setup
|
- name: Python setup
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5.1.1
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python_version }}
|
python-version: ${{ matrix.python_version }}
|
||||||
architecture: x64
|
architecture: x64
|
||||||
@@ -137,7 +137,7 @@ jobs:
|
|||||||
name: wheels
|
name: wheels
|
||||||
|
|
||||||
- name: Python setup
|
- name: Python setup
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5.1.1
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python_version }}
|
python-version: ${{ matrix.python_version }}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
* @tsunyoku @cmyui
|
||||||
|
|
||||||
|
# Infrastructure
|
||||||
|
/.github/* @cmyui
|
||||||
|
/tf/* @cmyui
|
||||||
|
/chart/* @cmyui
|
||||||
Generated
+3
-3
@@ -4,12 +4,12 @@ version = 3
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "akatsuki-pp"
|
name = "akatsuki-pp"
|
||||||
version = "0.9.6"
|
version = "1.0.1"
|
||||||
source = "git+https://github.com/osuAkatsuki/akatsuki-pp-rs?rev=a8b4eaffb2274d2e86ff042b7327286e13b6488d#a8b4eaffb2274d2e86ff042b7327286e13b6488d"
|
source = "git+https://github.com/osuAkatsuki/akatsuki-pp-rs?rev=b96019f50aa7d09bcbde60016481a69df04315e4#b96019f50aa7d09bcbde60016481a69df04315e4"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "akatsuki-pp-py"
|
name = "akatsuki-pp-py"
|
||||||
version = "1.0.0"
|
version = "1.0.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"akatsuki-pp",
|
"akatsuki-pp",
|
||||||
"pyo3",
|
"pyo3",
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "akatsuki-pp-py"
|
name = "akatsuki-pp-py"
|
||||||
version = "1.0.0"
|
version = "1.0.5"
|
||||||
description = "osu! difficulty and pp calculation for all modes"
|
description = "osu! difficulty and pp calculation for all modes"
|
||||||
authors = ["Max Ohn <ohn.m@hotmail.de>", "tsunyoku <tsunyoku@gmail.com>"]
|
authors = ["Max Ohn <ohn.m@hotmail.de>", "tsunyoku <tsunyoku@gmail.com>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
pyo3 = { version = "0.17", features = ["extension-module", "macros"] }
|
pyo3 = { version = "0.17", features = ["extension-module", "macros"] }
|
||||||
akatsuki-pp = { git = "https://github.com/osuAkatsuki/akatsuki-pp-rs", rev = "a8b4eaffb2274d2e86ff042b7327286e13b6488d" }
|
akatsuki-pp = { git = "https://github.com/osuAkatsuki/akatsuki-pp-rs", rev = "b96019f50aa7d09bcbde60016481a69df04315e4" }
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = "fat"
|
lto = "fat"
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "maturin"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "akatsuki-pp-py"
|
name = "akatsuki-pp-py"
|
||||||
version = "1.0.0"
|
version = "1.0.5"
|
||||||
requires-python = ">=3.7"
|
requires-python = ">=3.7"
|
||||||
description = "osu! difficulty and pp calculation for all modes"
|
description = "osu! difficulty and pp calculation for all modes"
|
||||||
classifiers = [
|
classifiers = [
|
||||||
|
|||||||
@@ -268,6 +268,8 @@ impl PyCalculator {
|
|||||||
n_spinners: attrs.difficulty.n_spinners,
|
n_spinners: attrs.difficulty.n_spinners,
|
||||||
stars: attrs.difficulty.stars,
|
stars: attrs.difficulty.stars,
|
||||||
max_combo: attrs.difficulty.max_combo,
|
max_combo: attrs.difficulty.max_combo,
|
||||||
|
aim_difficult_strain_count: 0.0,
|
||||||
|
speed_difficult_strain_count: 0.0,
|
||||||
},
|
},
|
||||||
pp: attrs.pp,
|
pp: attrs.pp,
|
||||||
pp_acc: attrs.pp_acc,
|
pp_acc: attrs.pp_acc,
|
||||||
|
|||||||
+7
-1
@@ -1,10 +1,10 @@
|
|||||||
use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
|
use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
|
||||||
|
|
||||||
use pyo3::{pyclass, pymethods};
|
|
||||||
use akatsuki_pp::{
|
use akatsuki_pp::{
|
||||||
catch::CatchDifficultyAttributes, mania::ManiaDifficultyAttributes,
|
catch::CatchDifficultyAttributes, mania::ManiaDifficultyAttributes,
|
||||||
osu::OsuDifficultyAttributes, taiko::TaikoDifficultyAttributes, DifficultyAttributes,
|
osu::OsuDifficultyAttributes, taiko::TaikoDifficultyAttributes, DifficultyAttributes,
|
||||||
};
|
};
|
||||||
|
use pyo3::{pyclass, pymethods};
|
||||||
|
|
||||||
#[pyclass(name = "DifficultyAttributes")]
|
#[pyclass(name = "DifficultyAttributes")]
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
@@ -91,6 +91,8 @@ impl Debug for BorrowedDifficultyAttributes<'_> {
|
|||||||
n_spinners,
|
n_spinners,
|
||||||
stars,
|
stars,
|
||||||
max_combo,
|
max_combo,
|
||||||
|
aim_difficult_strain_count,
|
||||||
|
speed_difficult_strain_count,
|
||||||
} = attrs;
|
} = attrs;
|
||||||
|
|
||||||
debug.field("mode", &0_u8);
|
debug.field("mode", &0_u8);
|
||||||
@@ -109,6 +111,8 @@ impl Debug for BorrowedDifficultyAttributes<'_> {
|
|||||||
n_spinners,
|
n_spinners,
|
||||||
stars,
|
stars,
|
||||||
max_combo,
|
max_combo,
|
||||||
|
aim_difficult_strain_count,
|
||||||
|
speed_difficult_strain_count,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Self::Taiko(attrs) => {
|
Self::Taiko(attrs) => {
|
||||||
@@ -230,4 +234,6 @@ getters! {
|
|||||||
n_tiny_droplets as usize: (Catch),
|
n_tiny_droplets as usize: (Catch),
|
||||||
ar as f64: (Osu, Catch),
|
ar as f64: (Osu, Catch),
|
||||||
hit_window as f64: (Taiko, Mania),
|
hit_window as f64: (Taiko, Mania),
|
||||||
|
aim_difficult_strain_count as f64: (Osu),
|
||||||
|
speed_difficult_strain_count as f64: (Osu),
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user