From a8ebb31f301adab0928b4a1c040f56118570042f Mon Sep 17 00:00:00 2001 From: JPK314 Date: Mon, 7 Aug 2023 19:51:00 -0400 Subject: [PATCH 1/5] Fix flip timer max --- CoyoteObs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CoyoteObs.py b/CoyoteObs.py index c6cc1a4..c1d22f0 100644 --- a/CoyoteObs.py +++ b/CoyoteObs.py @@ -428,8 +428,9 @@ def _update_addl_timers(self, player: PlayerData, state: GameState, prev_actions if self.has_flippeds[cid]: self.fliptimes[cid] += self.time_interval * 120 # FLIP_TORQUE_TIME = 78 ticks + # PITCH_LOCK_TIME = 120 ticks self.fliptimes[cid] = min( - 78, self.fliptimes[cid]) + 120, self.fliptimes[cid]) # update handbrake if prev_actions[7] == 1: From c7f34f7340411a25ec736747057a89a879d7968a Mon Sep 17 00:00:00 2001 From: JPK314 Date: Mon, 7 Aug 2023 19:53:27 -0400 Subject: [PATCH 2/5] Fix max flip time --- rewards.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rewards.py b/rewards.py index 99ad835..82f5b3c 100644 --- a/rewards.py +++ b/rewards.py @@ -967,7 +967,7 @@ def reset(self, initial_state: GameState): for i in range(len(initial_state.players)): if self.has_flippeds[i]: - self.fliptimes[i] = 78 + self.fliptimes[i] = 120 # self.has_doublejumpeds = [False] * len(initial_state.players) # self.flipdirs = [ # [0] * 2 for _ in range(len(initial_state.players))] @@ -1163,8 +1163,9 @@ def _update_addl_timers(self, player: PlayerData, state: GameState, prev_actions if self.has_flippeds[cid]: self.fliptimes[cid] += self.time_interval * 120 # FLIP_TORQUE_TIME = 78 ticks + # PITCH_LOCK_TIME = 120 ticks self.fliptimes[cid] = min( - 78, self.fliptimes[cid]) + 120, self.fliptimes[cid]) ret = 0 From 782e9cd54adc69b327bed170d496e151e5c6989e Mon Sep 17 00:00:00 2001 From: JPK314 Date: Mon, 7 Aug 2023 19:54:26 -0400 Subject: [PATCH 3/5] Update flip time scaling in obs for new range --- CoyoteObs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CoyoteObs.py b/CoyoteObs.py index c1d22f0..bb8c22d 100644 --- a/CoyoteObs.py +++ b/CoyoteObs.py @@ -227,7 +227,7 @@ def reset(self, initial_state: GameState): if self.add_fliptime: for i in range(len(initial_state.players)): if self.has_flippeds[i]: - self.fliptimes[i] = 78 + self.fliptimes[i] = 120 # self.has_doublejumpeds = [False] * len(initial_state.players) # self.flipdirs = [[0] * 2 for _ in range(len(initial_state.players) + 1)] @@ -562,7 +562,7 @@ def create_player_packet_timers_njit(car_position: np.ndarray, boosttime / 12, jumptime / 24, airtime / 150, - fliptime / 78, + fliptime / 120, braketime, flip_dir_1, flip_dir_2 From 499e6af17f8f4d9000a760c2537736b60c7b244c Mon Sep 17 00:00:00 2001 From: JPK314 Date: Mon, 7 Aug 2023 19:59:23 -0400 Subject: [PATCH 4/5] Update dodge deadzone default to 0.5 --- CoyoteObs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoyoteObs.py b/CoyoteObs.py index bb8c22d..dcf9103 100644 --- a/CoyoteObs.py +++ b/CoyoteObs.py @@ -72,7 +72,7 @@ def __init__(self, tick_skip=8, team_size=3, expanding: bool = True, extra_boost add_fliptime=False, add_airtime=False, add_boosttime=False, - dodge_deadzone=0.8, + dodge_deadzone=0.5, flip_dir=True, end_object: PhysicsObject = None, mask_aerial_opp=False, From f0d097598a8dfaf1e30800235ce41073d80e49a2 Mon Sep 17 00:00:00 2001 From: JPK314 Date: Mon, 7 Aug 2023 19:59:46 -0400 Subject: [PATCH 5/5] Update dodge deadzone default to 0.5 --- rewards.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rewards.py b/rewards.py index 82f5b3c..4079238 100644 --- a/rewards.py +++ b/rewards.py @@ -103,7 +103,7 @@ def __init__( curve_wave_zap_dash_w=0, walldash_w=0, # dash_w=0, - dodge_deadzone=0.8, + dodge_deadzone=0.5, goal_speed_exp=1, # fix this eventually min_goal_speed_rewarded_kph=0, touch_height_exp=1,