Cool_Tools/bemaniutils
1
0
Fork 0
mirror of synced 2025-01-31 12:13:49 +01:00
Code Releases Activity

Add support for Festo random 10s course, create a KAC course phase since we have too many courses now.

Browse Source
This commit is contained in:
Jennifer Taylor 2022-10-01 16:49:05 +00:00
parent 26a062605a
commit 12f4ee2bfa
3 changed files with 289 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

380
bemani/backend/jubeat/festo.py
View File

@ -148,7 +148,7 @@ class JubeatFesto(
""" """
Insert daily FC challenges into the DB. Insert daily FC challenges into the DB.
""" """
events = [] events: List[Tuple[str, Dict[str, Any]]] = []
if data.local.network.should_schedule(cls.game, cls.version, 'fc_challenge', 'daily'): if data.local.network.should_schedule(cls.game, cls.version, 'fc_challenge', 'daily'):
# Generate a new list of two FC challenge songs. # Generate a new list of two FC challenge songs.
start_time, end_time = data.local.network.get_schedule_duration('daily') start_time, end_time = data.local.network.get_schedule_duration('daily')
@ -177,6 +177,74 @@ class JubeatFesto(
# Mark that we did some actual work here. # Mark that we did some actual work here.
data.local.network.mark_scheduled(cls.game, cls.version, 'fc_challenge', 'daily') data.local.network.mark_scheduled(cls.game, cls.version, 'fc_challenge', 'daily')
if data.local.network.should_schedule(cls.game, cls.version, 'random_course', 'daily'):
# Generate a new list of three random songs for random course mode.
start_time, end_time = data.local.network.get_schedule_duration('daily')
def is_ten(song: Song) -> bool:
# We only want random songs that actually have a hard chart! This should be all songs right now,
# but let's be conservative in case a future game screws things up.
if song.chart not in {cls.CHART_TYPE_HARD_BASIC, cls.CHART_TYPE_HARD_ADVANCED, cls.CHART_TYPE_HARD_EXTREME}:
return False
difficulty = song.data.get_float('difficulty', 13)
if difficulty == 13.0:
difficulty = float(song.data.get_int('difficulty', 13))
return difficulty >= 10.0 and difficulty < 11.0
def chart_lut(chart: int) -> int:
return {
cls.CHART_TYPE_HARD_BASIC: cls.CHART_TYPE_BASIC,
cls.CHART_TYPE_HARD_ADVANCED: cls.CHART_TYPE_ADVANCED,
cls.CHART_TYPE_HARD_EXTREME: cls.CHART_TYPE_EXTREME,
}[chart]
all_tens = [song for song in data.local.music.get_all_songs(cls.game, cls.version) if is_ten(song)]
if len(all_tens) >= 3:
course_songs = random.sample(all_tens, 3)
data.local.game.put_time_sensitive_settings(
cls.game,
cls.version,
'random_course',
{
'start_time': start_time,
'end_time': end_time,
'song1': {
'id': course_songs[0].id,
'chart': chart_lut(course_songs[0].chart),
},
'song2': {
'id': course_songs[1].id,
'chart': chart_lut(course_songs[1].chart),
},
'song3': {
'id': course_songs[2].id,
'chart': chart_lut(course_songs[2].chart),
},
},
)
events.append((
'jubeat_random_course_charts',
{
'version': cls.version,
'song1': {
'id': course_songs[0].id,
'chart': chart_lut(course_songs[0].chart),
},
'song2': {
'id': course_songs[1].id,
'chart': chart_lut(course_songs[1].chart),
},
'song3': {
'id': course_songs[2].id,
'chart': chart_lut(course_songs[2].chart),
},
},
))
# Mark that we did some actual work here.
data.local.network.mark_scheduled(cls.game, cls.version, 'random_course', 'daily')
return events return events
@classmethod @classmethod
@ -185,6 +253,20 @@ class JubeatFesto(
Return all of our front-end modifiably settings. Return all of our front-end modifiably settings.
""" """
return { return {
'ints': [
{
'name': 'KAC Course Phase',
'tip': 'The KAC competition courses that should be available in Tune Run',
'category': 'game_config',
'setting': 'kac_phase',
'values': {
0: 'No KAC phase',
1: 'The 8th KAC',
2: 'The 9th KAC',
3: 'The 10th KAC',
}
},
],
'bools': [ 'bools': [
{ {
'name': 'Enable Stone Tablet Event', 'name': 'Enable Stone Tablet Event',
@ -210,6 +292,172 @@ class JubeatFesto(
# only final data, but that's no fun! # only final data, but that's no fun!
dataver = self.model.version or 2022052400 dataver = self.model.version or 2022052400
# If it is available, then grab the random course. If we haven't generated that course, then
# just don't bother trying to create it.
entry = self.data.local.game.get_time_sensitive_settings(self.game, self.version, 'random_course')
random_course: List[Dict[str, Any]] = []
if entry is not None:
song1 = entry.get_dict('song1')
song2 = entry.get_dict('song2')
song3 = entry.get_dict('song3')
random_course = [{
'id': 57,
'name': '腕試し！ランダムコース',
'course_type': self.COURSE_TYPE_PERMANENT,
'clear_type': self.COURSE_CLEAR_COMBINED_SCORE,
'hard': True,
'difficulty': 15,
'score': 2850000,
'music': [
[(song1.get_int('id'), song1.get_int('chart'))],
[(song2.get_int('id'), song2.get_int('chart'))],
[(song3.get_int('id'), song3.get_int('chart'))],
],
}]
# So the game has a hard limit of 60 courses, but if we include everything from the
# lifetime of festo including the random course we end up with 61 courses, which means
# the game truncates the last course. Boo, that sucks. So, we have to have certain
# courses switched. Let's do the KAC courses since in real life there would never have
# been multiple KAC courses available at once.
game_config = self.get_game_config()
kac_phase = game_config.get_int('kac_phase')
kac_8th = []
kac_9th = []
kac_10th = []
if kac_phase == 1:
kac_8th = [
{
'id': 41,
'name': 'The 8th KAC 個人部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000052, 2)],
[(90000013, 2)],
[(70000167, 2)],
],
},
{
'id': 42,
'name': 'The 8th KAC 団体部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000009, 2)],
[(80000133, 2)],
[(80000101, 2)],
],
},
]
elif kac_phase == 2:
kac_9th = [
{
'id': 201,
'name': 'The 9th KAC 1st Stage 個人部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000125, 2)],
[(60000065, 2)],
[(90000023, 2)],
],
},
{
'id': 202,
'name': 'The 9th KAC 1st Stage 団体部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000125, 2)],
[(50000135, 2)],
[(90000045, 2)],
],
},
{
'id': 203,
'name': 'The 9th KAC 2nd Stage 個人部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000095, 2)],
[(80000085, 2)],
[(80000090, 2)],
],
},
{
'id': 204,
'name': 'The 9th KAC 2nd Stage 団体部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000113, 2)],
[(50000344, 2)],
[(90000096, 2)],
],
},
]
elif kac_phase == 3:
kac_10th = [
{
'id': 205,
'name': 'The 10th KAC 1st Stage',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000003, 2)],
[(90000151, 2)],
[(90000174, 2)],
],
},
{
'id': 206,
'name': 'The 10th KAC 2nd Stage',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000121, 2)],
[(90000113, 2)],
[(90000124, 2)],
],
},
]
return [ return [
# ASARI CUP # ASARI CUP
{ {
@ -732,36 +980,7 @@ class JubeatFesto(
], ],
}, },
# HOTATE CUP # HOTATE CUP
{ *kac_8th, # Contains courses 41 and 42.
'id': 41,
'name': 'The 8th KAC 個人部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000052, 2)],
[(90000013, 2)],
[(70000167, 2)],
],
},
{
'id': 42,
'name': 'The 8th KAC 団体部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000009, 2)],
[(80000133, 2)],
[(80000101, 2)],
],
},
{ {
'id': 43, 'id': 43,
'name': 'BEMANI MASTER KOREA 2019', 'name': 'BEMANI MASTER KOREA 2019',
@ -777,96 +996,8 @@ class JubeatFesto(
[(90000009, 2)], [(90000009, 2)],
], ],
}, },
{ *kac_9th, # Contains courses 201, 202, 203 and 204.
'id': 201, *kac_10th, # Contains courses 205 and 206.
'name': 'The 9th KAC 1st Stage 個人部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000125, 2)],
[(60000065, 2)],
[(90000023, 2)],
],
},
{
'id': 202,
'name': 'The 9th KAC 1st Stage 団体部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000125, 2)],
[(50000135, 2)],
[(90000045, 2)],
],
},
{
'id': 203,
'name': 'The 9th KAC 2nd Stage 個人部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000095, 2)],
[(80000085, 2)],
[(80000090, 2)],
],
},
{
'id': 204,
'name': 'The 9th KAC 2nd Stage 団体部門',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000113, 2)],
[(50000344, 2)],
[(90000096, 2)],
],
},
{
'id': 205,
'name': 'The 10th KAC 1st Stage',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000003, 2)],
[(90000151, 2)],
[(90000174, 2)],
],
},
{
'id': 206,
'name': 'The 10th KAC 2nd Stage',
'course_type': self.COURSE_TYPE_TIME_BASED,
'end_time': Time.end_of_this_week() + Time.SECONDS_IN_WEEK,
'clear_type': self.COURSE_CLEAR_SCORE,
'hard': True,
'difficulty': 14,
'score': 700000,
'music': [
[(90000121, 2)],
[(90000113, 2)],
[(90000124, 2)],
],
},
{ {
'id': 207, 'id': 207,
'name': '#どうやって押してる？', 'name': '#どうやって押してる？',
@ -1075,9 +1206,7 @@ class JubeatFesto(
[(90000057, 2)], [(90000057, 2)],
], ],
}, },
# TODO: We are missing the "Random Course" course from this mode, which picks a random song *random_course, # Contains course 57.
# with difficulty 10.0-10.9 for the first, second and third song in the course. We would need
# to code in a random level song select, which could also be useful for the recommended endpoint.
{ {
'id': 58, 'id': 58,
'name': '#あなたのjubeatはどこから？', 'name': '#あなたのjubeatはどこから？',
@ -1295,6 +1424,7 @@ class JubeatFesto(
info.add_child(clan_course_list) info.add_child(clan_course_list)
valid_courses: Set[int] = set() valid_courses: Set[int] = set()
dataver = self.model.version or 2022052400
for course in self.__get_course_list(): for course in self.__get_course_list():
if course['id'] < 1: if course['id'] < 1:
raise Exception(f"Invalid course ID {course['id']} found in course list!") raise Exception(f"Invalid course ID {course['id']} found in course list!")
@ -1315,7 +1445,7 @@ class JubeatFesto(
# Basics # Basics
clan_course = Node.void('course') clan_course = Node.void('course')
clan_course_list.add_child(clan_course) clan_course_list.add_child(clan_course)
clan_course.set_attribute('release_code', '2018112700') clan_course.set_attribute('release_code', str(dataver))
clan_course.set_attribute('version_id', '0') clan_course.set_attribute('version_id', '0')
clan_course.set_attribute('id', str(course['id'])) clan_course.set_attribute('id', str(course['id']))
clan_course.set_attribute('course_type', str(course['course_type'])) clan_course.set_attribute('course_type', str(course['course_type']))

30
bemani/frontend/static/components/events.react.js
View File

@ -290,6 +290,36 @@ var JubeatFCChallengeEvent = React.createClass({
}, },
}); });
var JubeatRandomCourseEvent = React.createClass({
render: function() {
var event = this.props.event;
var game = this.props.versions[event.data.version];
var charts = ["Basic", "Advanced", "Extreme"];
return (
<tr key={event.id}>
<td><Timestamp timestamp={event.timestamp} /></td>
<td className="scheduled">
<div className="circle" />
Generated New {game} Random 10s Course
</td>
<td className="details">
<div>Songs:</div>
{[event.data.song1, event.data.song2, event.data.song3].map(function(song) {
return (
<div>
<a href={Link.get('jubeatsong', song.id) + "#" + charts[song.chart]}>
{this.props.songs[song.id].artist}{this.props.songs[song.id].artist ? " - " : ""}{this.props.songs[song.id].name}
</a> ({charts[song.chart]})
</div>
);
}.bind(this))}
</td>
</tr>
);
},
});
var IIDXDailyChartsEvent = React.createClass({ var IIDXDailyChartsEvent = React.createClass({
render: function() { render: function() {
var event = this.props.event; var event = this.props.event;

4
bemani/frontend/static/controllers/admin/events.react.js
View File

@ -6,6 +6,7 @@ var possible_events = [
'unauthorized_pcbid', 'unauthorized_pcbid',
'jubeat_league_course', 'jubeat_league_course',
'jubeat_fc_challenge_charts', 'jubeat_fc_challenge_charts',
'jubeat_random_course_charts',
'iidx_daily_charts', 'iidx_daily_charts',
'pcbevent', 'pcbevent',
'paseli_transaction', 'paseli_transaction',
@ -19,6 +20,7 @@ var event_names = {
'unauthorized_pcbid': 'Unauthorized PCBIDs', 'unauthorized_pcbid': 'Unauthorized PCBIDs',
'jubeat_league_course': 'Jubeat League Courses', 'jubeat_league_course': 'Jubeat League Courses',
'jubeat_fc_challenge_charts': 'Jubeat Full Combo Challenge Charts', 'jubeat_fc_challenge_charts': 'Jubeat Full Combo Challenge Charts',
'jubeat_random_course_charts': 'Jubeat Random 10s Course Charts',
'iidx_daily_charts': 'IIDX Daily Charts', 'iidx_daily_charts': 'IIDX Daily Charts',
'pnm_course': 'Pop\'n Music Course', 'pnm_course': 'Pop\'n Music Course',
'pcbevent': 'PCB Events', 'pcbevent': 'PCB Events',
@ -170,6 +172,8 @@ var audit_events = React.createClass({
return <JubeatLeagueCourseEvent event={event} versions={this.state.jubeatversions} songs={this.state.jubeatsongs} />; return <JubeatLeagueCourseEvent event={event} versions={this.state.jubeatversions} songs={this.state.jubeatsongs} />;
} else if(event.type == 'jubeat_fc_challenge_charts') { } else if(event.type == 'jubeat_fc_challenge_charts') {
return <JubeatFCChallengeEvent event={event} versions={this.state.jubeatversions} songs={this.state.jubeatsongs} />; return <JubeatFCChallengeEvent event={event} versions={this.state.jubeatversions} songs={this.state.jubeatsongs} />;
} else if(event.type == 'jubeat_random_course_charts') {
return <JubeatRandomCourseEvent event={event} versions={this.state.jubeatversions} songs={this.state.jubeatsongs} />;
} else if(event.type == 'iidx_daily_charts') { } else if(event.type == 'iidx_daily_charts') {
return <IIDXDailyChartsEvent event={event} versions={this.state.iidxversions} songs={this.state.iidxsongs} />; return <IIDXDailyChartsEvent event={event} versions={this.state.iidxversions} songs={this.state.iidxsongs} />;
} else if(event.type == 'pcbevent') { } else if(event.type == 'pcbevent') {